From 0444972925d67eb9e32c9b2d36f2eda24d2f58c2 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 f8589a9..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
@@ -5,6 +5,8 @@
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,11 +46,12 @@
AND d.dept_name like CONCAT('%',#{user.deptName},'%')
</if>
<if test="user.createTimeFrom != null and user.createTimeFrom !=''">
- And u.create_time > #{user.createTimeFrom}
+ AND u.create_time > #{user.createTimeFrom}
</if>
<if test="user.createTimeTo!= null and user.createTimeTo !=''">
- And u.create_time < #{user.createTimeTo}
+ AND u.create_time < #{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>
--
Gitblit v1.8.0