From e57dc5878ff7170e2a8d8da145289ad1abcd70f8 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 28 Jan 2021 16:47:52 +0800
Subject: [PATCH] 申领人实验室搜索逻辑修改 ->优先课题组下的实验室，如果没有则搜索部门下的实验室
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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..8bb1b6b 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -218,7 +218,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 +244,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