From c12ca804e93a7f62b006dca60fa3d8797e0480d8 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 15 三月 2021 00:33:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 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 7973cc3..d512c96 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
@@ -45,11 +45,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