From bc2fe224aa18e0b503d26ceace086e90fadf5608 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 18 十二月 2020 14:41:40 +0800
Subject: [PATCH] 模块：api接口 修改：新增返回字段课题组 提出：秦老师
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 19 ++++++++++++++++++-
1 files changed, 18 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 71cf4fe..3adeb7c 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -164,16 +164,33 @@
</select>
<select id="getUserListByContainerCode" parameterType="java.util.Map" resultMap="SysUser">
- select u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,container_code,bm2.meta_value department,bm1.meta_value company,u.arp,u.point
+ select u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,container_code,bm2.meta_value department,bm1.meta_value company,u.arp,u.point,sp.project
from sys_user u
left join sys_laboratory l on l.department = u.department and l.valid_flag = 1
left join sys_laboratory_container c on c.laboratory_id = l.id and c.valid_flag = 1
left join base_meta bm1 on bm1.id = u.company
left join base_meta bm2 on bm2.id = u.department
+ LEFT JOIN sys_project sp on sp.id = u.project_id and sp.valid_flag = 1
where container_code = #{0}
and u.update_time >= #{1} and #{2} > u.update_time
</select>
+
+ <select id="getUserListByContainerCodeNew" parameterType="java.util.Map" resultMap="SysUser">
+ SELECT u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,bm2.meta_value department,bm1.meta_value company,u.arp,u.point,sp.project
+ from sys_user u
+ left join base_meta bm1 on bm1.id = u.company
+ left join base_meta bm2 on bm2.id = u.department
+ LEFT JOIn sys_project sp on sp.id = u.project_id
+ where u.project_id = (
+ SELECT project_id from sys_laboratory_container
+ WHERE container_code = #{0}
+ and valid_flag = 1)
+ AND u.valid_flag = 1
+ and sp.valid_flag = 1
+ and u.update_time >= #{1} and #{2} > u.update_time
+ </select>
+
<select id="selectByAccount" parameterType="com.nanometer.smartlab.entity.SysUser" resultMap="SysUser">
select * from sys_user where valid_flag=1 and account=#{account}
</select>
--
Gitblit v1.9.2