From 0843d9fa608a6d319d9d1c37860a0f16ce263a19 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 30 六月 2025 15:37:25 +0800
Subject: [PATCH] 设备车间管理与用户

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
index 3e751a9..4a9892b 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -45,7 +45,7 @@
 			and username = #{username}
 		</if>
 	</select>
-	
+
 	<!--  淇敼鐢ㄦ埛閮ㄩ棬code -->
 	<update id="updateUserDepart">
 		UPDATE sys_user SET org_code = #{orgCode} where username = #{username}
@@ -55,7 +55,7 @@
 	<select id="getUserByPhone"  resultType="org.jeecg.modules.system.entity.SysUser">
 		select * from  sys_user  where phone = #{phone} and del_flag = 0
 	</select>
-	
+
 	<!-- 鏍规嵁閭鏌ヨ鐢ㄦ埛淇℃伅 -->
 	<select id="getUserByEmail" resultType="org.jeecg.modules.system.entity.SysUser">
 	select * from  sys_user  where email = #{email} and del_flag = 0
@@ -215,6 +215,22 @@
 				LEFT JOIN sys_user_role t2 ON t1.id = t2.user_id
 				LEFT JOIN sys_role t3 ON t2.role_id = t3.id
 		WHERE
-			t3.role_code = #{roleCode} AND equipment_ids LIKE concat(concat('%',#{equipmentId}),'%')
+			t3.role_code = #{roleCode} AND t1.equipment_ids LIKE concat(concat('%',#{equipmentId}),'%')
 	</select>
-</mapper>
\ No newline at end of file
+    <select id="getUserByRoleCodeList" resultType="org.jeecg.modules.system.entity.SysUser">
+		SELECT
+			su.*
+		FROM
+			sys_user su
+				LEFT JOIN sys_user_role sur ON su.id = sur.user_id
+				LEFT JOIN sys_role sr ON sur.role_id = sr.id
+		WHERE
+		su.del_flag = '0' and sr.role_code in
+		<foreach collection="roleCodeList" index="index" item="roleCode" open="(" separator="," close=")">
+			#{roleCode}
+		</foreach>
+	</select>
+	<select id="getUserByWorkShopDepartId" resultType="org.jeecg.modules.system.entity.SysUser">
+		select * from sys_user where del_flag = 0 and id in (select user_id from mom_eam_work_shop_depart_user where work_shop_depart_id = #{workShopDepartId})
+	</select>
+</mapper>

--
Gitblit v1.9.3