From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index d6d1d60..cc58d84 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -83,11 +83,6 @@
from user u left join custom c on u.company = c.id
where u.id = #{userId}
</select>
- <select id="seldepLimsId" resultType="java.lang.String">
- select name
- from department_lims
- where id = #{depLimsId}
- </select>
<select id="getLaboratoryPersonList" resultType="java.util.Map">
select
u.id,
@@ -107,4 +102,28 @@
and dl.name = #{laboratory}
</if>
</select>
+ <select id="seldepLimsId" resultType="java.lang.String">
+ select name
+ from department_lims
+ where id = #{depLimsId}
+ </select>
+ <select id="getPersonList" resultType="java.util.Map">
+ select
+ u.id,
+ u.name,
+ dl.name as depName
+ from
+ user u
+ left join
+ department_lims dl
+ on
+ FIND_IN_SET(dl.id,u.depart_lims_id)
+ where
+ dl.name in('閫氫俊浜у搧瀹為獙瀹�','鐢靛姏浜у搧瀹為獙瀹�','妫�娴嬪姙')
+ and u.status = 1
+ and u.is_custom = 0
+ <if test="laboratory!='' and laboratory!=null">
+ and (dl.name = #{laboratory} or dl.name='妫�娴嬪姙')
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3