From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 7 +++++--
1 files changed, 5 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 a17fab9..1907ebc 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -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}
@@ -76,7 +79,7 @@
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,"/",","))
+ AND find_in_set(#{dto.companySpecialId},REPLACE(sd.company_path,'/',','))
</if>
</where>
${orderByClause}
--
Gitblit v1.9.3