From e142433c71b032ce85546477543d65da0f3986b8 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 21 Sep 2024 13:20:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

---
 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/dao/mapper/xml/CtUserMapper.xml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 3251ac0..1d2763f 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
@@ -409,18 +409,20 @@
     </select>
 
     <!--  根据部门和角色查询  -->
-    <select id="listUserByDeptRoleList" resultMap="dataResult">
+    <select id="listUserByUnitRoleList" 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>
+        AND t1.unit_id = #{unitId}
+    </select>
+
+    <select id="selectByIdCard" resultMap="dataResult">
+        SELECT * FROM dyh_ct_user
+        WHERE
+            delete_status = '0'
+            and status = '1' and idcard=#{idCard}
     </select>
 </mapper> 
\ No newline at end of file

--
Gitblit v1.8.0