From 46b833a0f8bb135fdd885ad5960d9c4e2d72def0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 25 May 2023 16:46:38 +0800
Subject: [PATCH] 用户列表查询修改（新增职位关联查询返回）
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
index 4276b97..0ec8435 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/mapper/UserMapper.xml
@@ -27,27 +27,33 @@
<result column="post_id" property="postId"/>
</resultMap>
- <select id="selectUserPage" resultMap="userResultMap">
- select * from blade_user where is_deleted = 0
+ <select id="selectUserPage" resultType="cn.gistack.system.user.vo.UserVO">
+ select bu.*,armp.jobName from blade_user bu
+ left join (
+ select "user_phone" as userPhone,CONCAT_WS('-',"user_unit","position") jobName from SJZT_MD."att_res_manage_person" where "guid" in (
+ select max("guid") as guid from SJZT_MD."att_res_manage_person" group by "user_phone"
+ )
+ ) armp on bu.phone = armp.userPhone
+ where bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
- and tenant_id = #{tenantId}
+ and bu.tenant_id = #{tenantId}
</if>
<if test="user.tenantId!=null and user.tenantId != ''">
- and tenant_id = #{user.tenantId}
+ and bu.tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and bu.account = #{user.account}
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name like concat(concat('%',#{user.realName}),'%')
+ and bu.real_name like concat(concat('%',#{user.realName}),'%')
</if>
<if test="user.userType!=null and user.userType != ''">
- and user_type = #{user.userType}
+ and bu.user_type = #{user.userType}
</if>
<if test="user.roleId!=null and user.roleId != ''">
- and role_id like concat('%',#{user.roleId},'%')
+ and bu.role_id like concat('%',#{user.roleId},'%')
</if>
- <if test="deptIdList!=null and deptIdList.size>0">
+ <if test="deptIdList!=null and deptIdList.size()>0">
and id in (
SELECT
user_id
@@ -60,7 +66,7 @@
</foreach>
)
</if>
- ORDER BY id
+ ORDER BY bu.id
</select>
<select id="getUser" resultMap="userResultMap">
--
Gitblit v1.9.3