From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index 64b16c6..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}
@@ -218,7 +227,7 @@
WHERE su.valid_flag = 1
and sl.valid_flag = 1
and slc.valid_flag = 1
-
+ ORDER BY su.`name` asc
</select>
<select id="getUserListByProject" parameterType="java.util.Map" resultMap="SysUser">
@@ -244,9 +253,15 @@
FROM sys_user AS su
LEFT JOIN base_meta bm ON su.department = bm.id
LEFT JOIN base_meta com on com.id = su.company
- WHERE
+ <where>
su.valid_flag = 1
- AND su.account = #{account}
+ <if test="account != null and account !=''">
+ AND su.account = #{account}
+ </if>
+ <if test="name != null and name !=''">
+ AND su.name = #{name}
+ </if>
+ </where>
</select>
<select id="getUserByProject" resultType="com.nanometer.smartlab.entity.dto.LaboratoryVo$LaboratoryUser">
SELECT
--
Gitblit v1.9.2