From 19b2927073b5a2b14ca07939a6bfc0a0a34fe98c Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:38 +0800
Subject: [PATCH] 修改bug

---
 febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
index 9e0e51e..6331868 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cc.mrbird.febs.server.system.mapper.UserMapper">
-    <select id="findUserDetailPage" parameterType="systemUser" resultType="systemUser">
+    <select id="findUserDetailPage" parameterType="cc.mrbird.febs.common.core.entity.system.SystemUser" resultType="cc.mrbird.febs.common.core.entity.system.SystemUser">
         SELECT
         u.user_id userId,
         u.username,
+        u.certificateNumb,
+        u.nickName,
         u.email,
         u.mobile,
         u.status,
@@ -17,7 +19,8 @@
         u.avatar,
         d.dept_name deptName,
         GROUP_CONCAT(r.role_id) roleId,
-        GROUP_CONCAT(r.role_name) roleName
+        GROUP_CONCAT(r.role_name) roleName,
+        d.allDeptName
         FROM
         t_user u
         LEFT JOIN t_dept d ON (u.dept_id = d.dept_id)
@@ -43,16 +46,17 @@
             AND d.dept_name like CONCAT('%',#{user.deptName},'%')
         </if>
         <if test="user.createTimeFrom != null and user.createTimeFrom !=''">
-            And u.create_time &gt; #{user.createTimeFrom}
+            AND u.create_time &gt; #{user.createTimeFrom}
         </if>
         <if test="user.createTimeTo!= null and user.createTimeTo !=''">
-            And u.create_time &lt; #{user.createTimeTo}
+            AND u.create_time &lt; #{user.createTimeTo}
         </if>
+        AND d.DEPT_ID IN (SELECT DEPT_ID FROM t_user_data_permission WHERE USER_ID= #{currentUserId} )
         group by u.username,u.user_id,u.email,u.mobile,u.status,u.create_time,u.ssex,
         u.dept_id,u.last_login_time,u.modify_time,u.description,u.avatar
     </select>
 
-    <select id="findUserDetail" parameterType="systemUser" resultType="systemUser">
+    <select id="findUserDetail" parameterType="cc.mrbird.febs.common.core.entity.system.SystemUser" resultType="cc.mrbird.febs.common.core.entity.system.SystemUser">
         SELECT
         u.user_id userId,
         u.username,

--
Gitblit v1.8.0