From 65464dfd5fa1cca2fa052d3b91311f0849c8dcb0 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Sun, 08 Sep 2024 09:28:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml
index 3a4d8be..3251ac0 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml
@@ -240,7 +240,7 @@
and disp_status = #{terms.dispStatus}
</if>
<if test="terms.deleteStatus = null and terms.deleteStatus =''">
- and delete_status = '1'
+ and delete_status = 0
</if>
<if test="terms.deleteStatus != null and terms.deleteStatus !=''">
and delete_status = #{terms.deleteStatus}
@@ -348,7 +348,7 @@
and t1.status = #{terms.status}
</if>
<if test="terms.deleteStatus = null and terms.deleteStatus =''">
- and t1.delete_status = '1'
+ and t1.delete_status = 0
</if>
<if test="terms.deleteStatus != null and terms.deleteStatus !=''">
and t1.delete_status = #{terms.deleteStatus}
@@ -383,7 +383,7 @@
and t1.status = #{terms.status}
</if>
<if test="terms.deleteStatus = null and terms.deleteStatus =''">
- and t1.delete_status = '1'
+ and t1.delete_status = 0
</if>
<if test="terms.deleteStatus != null and terms.deleteStatus !=''">
and t1.delete_status = #{terms.deleteStatus}
@@ -407,4 +407,20 @@
</if>
limit #{page.offset}, #{page.size}
</select>
+
+ <!-- 根据部门和角色查询 -->
+ <select id="listUserByDeptRoleList" resultMap="dataResult">
+ SELECT t1.id, t1.true_name, t1.dept_id
+ FROM dyh_ct_user t1 LEFT JOIN dyh_ct_userole t2 ON t1.id = t2.user_id
+ WHERE
+ t1.delete_status = '0'
+ AND t2.role_code = #{roleCode}
+ AND t1.status = '1'
+ <if test="deptIdList != null and deptIdList != ''">
+ and t1.dept_id in
+ <foreach collection="deptIdList" item="deptIdList" index="index" open="(" separator="," close=")">
+ #{deptIdList}
+ </foreach>
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0