From ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 27 Oct 2021 16:59:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index f5da893..f77d627 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -146,7 +146,16 @@
select DISTINCT su.*, br.name as roleName from sys_user as su
left join base_role as br on su.role_id = br.id inner join sys_project as sp on su.id=sp.sys_user_id
where su.valid_flag = 1
- <include refid="queryWhereSql"/>
+ <if test="department != null and department != ''">
+ and su.department = #{department}
+ </if>
+ <if test="approverFlag != null">
+ and su.approver_flag = #{approverFlag}
+ </if>
+ <if test="project != null and project != ''">
+ and (su.project like concat('%',#{project},'%')
+ or su.project is null or su.project = '')
+ </if>
order by su.arp ASC
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
--
Gitblit v1.9.2