From cf69b541f8ef1ac4fae24bd99b0259b7af035490 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 21 十月 2025 10:16:12 +0800
Subject: [PATCH] 优化
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 262a4b3..a1f3048 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -34,7 +34,7 @@
LEFT JOIN `company` sd ON sd.ID = usr.COMPANY_ID AND sd.ISDELETED = 0
LEFT JOIN `member` m ON usr.MEMBER_ID = m.id
<if test="dto.roleId != null">
- RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId}
+ RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.DELETED = 0 and sur.ROLE_ID = #{dto.roleId}
</if>
<where>
usr.DELETED = 0
@@ -69,14 +69,8 @@
<if test="dto.memberType != null ">
AND usr.`type` = #{dto.memberType}
</if>
- <if test="dto.memberType != null ">
- AND usr.`type` = #{dto.memberType}
- </if>
<if test="dto.workStatus != null ">
AND m.WORK_STATUS = #{dto.workStatus}
- </if>
- <if test="dto.memberType != null ">
- AND m.`type` = #{dto.memberType}
</if>
<if test="dto.companyId != null ">
AND usr.COMPANY_ID = #{dto.companyId}
--
Gitblit v1.9.3