From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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..a0727d6 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -27,14 +27,14 @@
sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME,
- sd.company_name_path as companyName
+ sd.company_name_path as companyName, usr.PROHIBIT_STATUS,usr.PROHIBIT_TIME,usr.ERR_TIMES,usr.FIRST_PASSWORD,usr.PROHIBIT_REMARK,usr.NEED_CHANGE_PWD
FROM `SYSTEM_USER` usr
LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
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