From b87239353afdc0c9502e81961249d527dd8ad54e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 15:19:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/UserMapper.xml | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 68d3dfc..4cdbd6d 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -329,30 +329,27 @@
</select>
- <select id="userPage" resultMap="BaseResultMap"
- parameterType="com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM">
+ <select id="userPage" resultType="com.mindskip.xzs.viewmodel.admin.user.UserResponseVM" parameterType="com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM">
SELECT
- a.*
+ a.*,
+ c.result as departmentExamineResult,
+ d.result as conditionExamineResult
FROM t_user a
- lEFT join
- (select * from t_user_department
- <if test="departmentId != null and departmentId.size() > 0">
- where department_id in <foreach collection="departmentId" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach>
- </if>
- group by user_id
- )
- b on a.id = b.user_id
- where
+ LEFT JOIN t_user_department b ON a.id = b.user_id
+ LEFT JOIN t_department_examine c ON a.id = c.user_id AND c.deleted = 0 AND c.result = 0
+ LEFT JOIN t_user_condition_examine d ON a.id = d.user_id AND d.deleted = 0 AND d.result = 0
+ WHERE
a.deleted=0
<if test="departmentId != null and departmentId.size() > 0">
- and b.department_id in <foreach collection="departmentId" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach>
+ AND b.department_id IN <foreach collection="departmentId" item="item" open="(" separator="," close=")"> #{item} </foreach>
</if>
<if test="userName != null and userName != ''">
- and real_name like concat('%',#{userName},'%')
+ AND real_name LIKE concat('%',#{userName},'%')
</if>
<if test="role != null and role.size() > 0">
- and role in <foreach collection="role" item="item" open="(" separator="," close=")"> #{item} </foreach>
+ AND role IN <foreach collection="role" item="item" open="(" separator="," close=")"> #{item} </foreach>
</if>
+ GROUP BY a.id
</select>
--
Gitblit v1.8.0