From 3c901b2289729b8d13689a52faaffb3cd1124594 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 27 三月 2025 13:25:08 +0800
Subject: [PATCH] 修改标准库查询bug
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 6634947..4a16c32 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -24,14 +24,33 @@
company,
is_custom
from user
- where del_flag = '0') a
+ where del_flag = '0'
+ and id != 1) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
+ <!-- 鑾峰彇鐢ㄦ埛閮ㄩ棬 -->
+ <select id="selectUserDepartmentLimsName" resultType="java.lang.String">
+ select dl.name
+ from user u
+ left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1
+ where u.id = #{userId}
+ limit 1
+ </select>
+
+ <!-- 鏌ヨ鐢ㄦ埛鍜岄儴闂� -->
+ <select id="selectNameAnddepartment" resultType="java.util.Map">
+ select u.name userName,
+ dl.name department
+ from user u
+ left join department_lims dl on find_in_set(dl.id, u.depart_lims_id) and dl.id != 1
+ where find_in_set(u.id, #{participant})
+ </select>
+
<!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 -->
- <select id="getUserNow" resultType="com.ruoyi.common.core.domain.entity.User">
+ <select id="getUserNow" resultType="com.ruoyi.system.domain.vo.UserVo">
select u.id,
c.company,
u.name,
@@ -42,4 +61,39 @@
left join custom c on u.company = c.id
where u.id = #{userId}
</select>
+
+ <!-- 鑾峰彇妫�娴嬩汉鍛樹俊鎭� -->
+ <select id="selectQualityUserList" resultType="com.ruoyi.common.core.domain.entity.User">
+ select u1.id,
+ u1.account,
+ u1.name,
+ u1.age,
+ u1.email,
+ u1.phone,
+ u1.company,
+ u1.is_custom,
+ u1.signature_url,
+ u1.picture_url,
+ u1.name_en,
+ u1.depart_lims_id
+ from user u1
+ left join sys_user_role sur on sur.user_id = u1.id
+ where sur.role_id not in (1, 15, 16, 17)
+ and u1.status = '0'
+ group by u1.id
+ </select>
+
+ <!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴� -->
+ <select id="selectDepartmentLimsUserList" resultType="com.ruoyi.common.core.domain.entity.User">
+ select id,
+ account,
+ name,
+ name_en,
+ status
+ from user u
+ where depart_lims_id = (select u2.depart_lims_id
+ from user u2
+ where u2.id = #{userId})
+ </select>
+
</mapper>
--
Gitblit v1.9.3