From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001 From: lxp <1928192722@qq.com> Date: 星期三, 12 三月 2025 15:37:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 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..750379a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml @@ -107,4 +107,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