From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' 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 8bb1b6b..e171985 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -74,6 +74,12 @@
<if test="waster != null">
and su.waster = #{waster}
</if>
+ <if test="project != null and project != ''">
+ and su.project like concat("%",#{project},"%")
+ </if>
+ <if test="company != null and company != ''">
+ and bm1.meta_value like concat("%",#{company},"%")
+ </if>
</sql>
<select id="getSysUser" parameterType="java.lang.String" resultMap="SysUser" >
@@ -117,6 +123,7 @@
select su.*, br.name as roleName from sys_user as su
left join base_role as br on su.role_id = br.id
left join base_meta bm on su.department = bm.id
+ left join base_meta bm1 on bm1.id = su.company
where su.valid_flag = 1
<if test="departmentNameLike != null and departmentNameLike != ''">
and bm.meta_value like #{departmentNameLike}
@@ -150,7 +157,9 @@
</select>
<select id="getSysUserTotalCount" parameterType="java.util.Map" resultType="int">
- select count(1) from sys_user as su left join base_meta bm on su.department = bm.id
+ select count(1) from sys_user as su
+ left join base_meta bm on su.department = bm.id
+ left join base_meta bm1 on bm1.id = su.company
where su.valid_flag = 1
<if test="departmentNameLike != null and departmentNameLike != ''">
and bm.meta_value like #{departmentNameLike}
--
Gitblit v1.9.2