From df18b23b4569828d6be32fb64c80492241e1fc46 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十月 2023 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..cd4c625 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
@@ -29,6 +29,7 @@
<result column="pwd_update_time" property="pwdUpdateTime"/>
<result column="secretgrade" property="secretGrade"/>
<result column="strategy_update_status" property="strategyUpdateStatus"/>
+ <result column="user_status" property="userStatus"/>
</resultMap>
@@ -39,11 +40,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 +75,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>
@@ -94,9 +92,23 @@
</select>
<select id="selectByIdUser" resultType="com.vci.ubcs.system.user.entity.User">
- select id, code, user_type, account, password , name, real_name, avatar, email, phone , birthday, sex, role_id, dept_id, post_id , pwd_update_time, secretgrade, strategy_update_status, tenant_id, create_user , create_dept, create_time, update_user, update_time, status , is_deleted
+ select id, code, user_type, account, password , name, real_name, avatar, email, phone , birthday, sex, role_id, dept_id, post_id , pwd_update_time, secretgrade, strategy_update_status, tenant_id, create_user , create_dept, create_time, update_user, update_time, status , is_deleted,user_status,
from pl_org_user
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