From 4db8dbe47236b038905ef0318e3e7746b3fdb645 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 九月 2023 17:08:18 +0800
Subject: [PATCH] 密码策略bug

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
index 2229dba..bd0e411 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
@@ -39,11 +39,8 @@
             LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
             LEFT JOIN PL_SYS_PWDSTRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
         WHERE is_deleted = 0
-        <if test="tenantId!=null and tenantId != ''">
-            and tenant_id = #{tenantId}
-        </if>
         <if test="user.tenantId!=null and user.tenantId != ''">
-            and tenant_id = #{user.tenantId}
+            and pou.tenant_id = #{user.tenantId}
         </if>
         <if test="user.account!=null and user.account != ''">
             and account = #{user.account}
@@ -77,7 +74,7 @@
             LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
             LEFT JOIN PL_SYS_PWDSTRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
         WHERE
-            tenant_id = #{param1} and account = #{param2}
+            pou.tenant_id = #{param1} and account = #{param2}
             <if test="param3!=null and param3 != ''">
                 and name = #{param3}
             </if>
@@ -99,4 +96,18 @@
             where id = #{userId} and is_deleted = 0
     </select>
 
+    <select id="getUserMap" resultType="map">
+        SELECT
+            PCR.ID as value,
+            PCR.ACCOUNT as lable
+        FROM
+            PL_ORG_USER PCR
+        WHERE
+            instr(PCR.ROLE_ID,#{roleId}) > 0
+        AND
+            PCR.ID != #{userId}
+        AND
+            PCR.IS_DELETED = 0
+    </select>
+
 </mapper>

--
Gitblit v1.9.3