From 82d09815c5efb03d448d6a5b74a5cbfe85063ebc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 18:46:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 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 89d7627..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,11 @@
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} and is_deleted = 0
+ pou.tenant_id = #{param1} and account = #{param2}
+ <if test="param3!=null and param3 != ''">
+ and name = #{param3}
+ </if>
+ and is_deleted = 0
</select>
<select id="exportUser" resultType="com.vci.ubcs.system.user.excel.UserExcel">
@@ -95,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