From 0d2a03ec404b9c047d5d5cd4654a48882135be5f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 16:53:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 1907ebc..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
--
Gitblit v1.9.3