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 | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 3eb9d91..750379a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -61,7 +61,51 @@
where u.id = #{userId}
</select>
<select id="selectUserInfo" resultType="com.ruoyi.common.core.vo.SysUserVO">
- select * from user
+ select u.id as user_id,
+ u.dept_id,
+ u.name as nick_name,
+ u.account as user_name,
+ u.name_en,
+ u.email,
+ u.phone as phone_number,
+ u.sex,
+ u.picture_url,
+ u.signature_url,
+ u.company,
+ c.company as company_name,
+ c.code,
+ u.password,
+ u.status,
+ u.del_flag,
+ u.login_ip,
+ u.login_date,
+ u.is_custom
+ 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,
+ 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 = 0
+ and u.is_custom = 0
+ <if test="laboratory!='' and laboratory!=null">
+ and dl.name = #{laboratory}
+ </if>
</select>
<select id="seldepLimsId" resultType="java.lang.String">
select name
--
Gitblit v1.9.3