From f6184e9df59eb8f8ac06fda6c3b8b9e8e76ccb3f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 15 七月 2025 20:30:20 +0800
Subject: [PATCH] art: 技术状态鉴定工单-流程问题修改
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 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 b40648b..acf40f3 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,7 +215,7 @@
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>
<select id="getUserByRoleCodeList" resultType="org.jeecg.modules.system.entity.SysUser">
SELECT
@@ -230,4 +230,18 @@
#{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>
+
+ <!-- 鏌ヨ鐢ㄦ埛鐨勬墍灞炰骇绾垮悕绉颁俊鎭� -->
+ <select id="getRepDepNamesByUserIds" resultType="org.jeecg.modules.system.vo.EamUserRepDepVo">
+ SELECT t2.depart_name repairDepartName, t1.user_id FROM eam_base_repair_depart_user t1, eam_base_repair_depart t2 WHERE t2.id = t1.depart_id AND t1.user_id IN
+ <foreach collection="userIds" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
+</mapper>
--
Gitblit v1.9.3