From 96a33df75fe629083dc44d51f46df1f31ffac8d7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 01 七月 2025 20:06:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 a1edd02..6aa707b 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
@@ -230,4 +230,10 @@
#{roleCode}
</foreach>
</select>
-</mapper>
\ No newline at end of file
+ <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 eam_base_factory_user where factory_id = #{baseFactoryId})
+ <if test="username!=null and username!=''">
+ and username = #{username}
+ </if>
+ </select>
+</mapper>
--
Gitblit v1.9.3