From b999398ae9b2719d2db15716dd353f7a3855d59e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 07 四月 2025 17:33:55 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 16 ++++++++++------
1 files changed, 10 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 f16af39..ed96594 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -24,8 +24,7 @@
company,
is_custom
from user
- where del_flag = '0'
- and id != ) a
+ where del_flag = '0') a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -77,10 +76,9 @@
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
+ WHERE u1.id IN (SELECT user_id FROM sys_user_role sur where sur.role_id in (4))
+-- WHERE u1.id IN (SELECT user_id FROM sys_user_role sur where sur.role_id not in (1, 15, 16, 17))
+ and u1.status = '0'
</select>
<!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴� -->
@@ -94,5 +92,11 @@
from user u2
where u2.id = #{userId})
</select>
+ <select id="selectByNames" resultType="com.ruoyi.common.core.domain.entity.User">
+ SELECT id, name FROM user WHERE name IN
+ <foreach item="name" collection="names" open="(" separator="," close=")">
+ #{name}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.3