From bf12237f0cedf8c2a9f0fe298f457772790c7d86 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 28 三月 2023 18:38:54 +0800
Subject: [PATCH] 提交code服务代码
---
Source/BladeX/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/Source/BladeX/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/Source/BladeX/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 86c72ef..9c1b7c3 100644
--- a/Source/BladeX/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/Source/BladeX/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -25,10 +25,20 @@
<result column="role_id" property="roleId"/>
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
+ <result column="strategy_name" property="pwdStrategy"/>
+ <result column="pwd_update_time" property="pwdUpdateTime"/>
+ <result column="secretgrade" property="secretgrade"/>
+ <result column="strategy_update_status" property="strategyUpdateStatus"/>
</resultMap>
+
<select id="selectUserPage" resultMap="userResultMap">
- select * from pl_org_user where is_deleted = 0
+ SELECT
+ pou.*,nvl(pss.STRATEGY_NAME,(SELECT STRATEGY_NAME FROM PL_SYS_STRATEGY WHERE IS_DEFAULT=1)) strategy_name
+ FROM pl_org_user pou
+ LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
+ LEFT JOIN PL_SYS_STRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
+ WHERE is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
and tenant_id = #{tenantId}
</if>
@@ -45,11 +55,11 @@
and user_type = #{user.userType}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
- and id in (
+ and pou.id in (
SELECT
user_id
FROM
- pl_org_user_dept
+ pl_org_user_dept poud
WHERE
dept_id IN
<foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
@@ -57,20 +67,32 @@
</foreach>
)
</if>
- ORDER BY id
+ ORDER BY pou.id
</select>
<select id="getUser" resultMap="userResultMap">
SELECT
- *
- FROM
- pl_org_user
+ pou.*,nvl(pss.STRATEGY_NAME,(SELECT STRATEGY_NAME FROM PL_SYS_STRATEGY WHERE IS_DEFAULT=1)) strategy_name
+ FROM pl_org_user pou
+ LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
+ LEFT JOIN PL_SYS_STRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
WHERE
tenant_id = #{param1} and account = #{param2} and is_deleted = 0
</select>
<select id="exportUser" resultType="org.springblade.system.user.excel.UserExcel">
- SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM pl_org_user ${ew.customSqlSegment}
+ SELECT
+ pou.*,nvl(pss.STRATEGY_NAME,(SELECT STRATEGY_NAME FROM PL_SYS_STRATEGY WHERE IS_DEFAULT=1)) strategy_name
+ FROM pl_org_user pou
+ LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
+ LEFT JOIN PL_SYS_STRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
+ ${ew.customSqlSegment}
+ </select>
+
+ <select id="selectByIdUser" resultType="org.springblade.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
+ from pl_org_user
+ where id = #{userId} and is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3