From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 750379a..43ec637 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,
@@ -125,7 +120,7 @@
FIND_IN_SET(dl.id,u.depart_lims_id)
where
dl.name in('閫氫俊浜у搧瀹為獙瀹�','鐢靛姏浜у搧瀹為獙瀹�','妫�娴嬪姙')
- and u.status = 1
+ and u.state = 1
and u.is_custom = 0
<if test="laboratory!='' and laboratory!=null">
and (dl.name = #{laboratory} or dl.name='妫�娴嬪姙')
--
Gitblit v1.9.3