From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 1554fc5..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
@@ -67,7 +67,10 @@
AND usr.`status` = #{dto.status}
</if>
<if test="dto.memberType != null ">
- AND m.`type` = #{dto.memberType}
+ AND usr.`type` = #{dto.memberType}
+ </if>
+ <if test="dto.workStatus != null ">
+ AND m.WORK_STATUS = #{dto.workStatus}
</if>
<if test="dto.companyId != null ">
AND usr.COMPANY_ID = #{dto.companyId}
@@ -75,8 +78,8 @@
<if test="dto.companyType != null ">
AND sd.`type` = #{dto.companyType}
</if>
- <if test="dto.querySpecial != null and dto.querySpecial = 1 ">
- AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,"/",","))
+ <if test="dto.querySpecial != null and dto.querySpecial == 1 ">
+ AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,'/',','))
</if>
</where>
${orderByClause}
--
Gitblit v1.9.3