From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 5 ++++-
1 files changed, 4 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 a17fab9..0b358d4 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -66,6 +66,9 @@
<if test="dto.status != null ">
AND usr.`status` = #{dto.status}
</if>
+ <if test="dto.workStatus != null ">
+ AND m.WORK_STATUS = #{dto.workStatus}
+ </if>
<if test="dto.memberType != null ">
AND m.`type` = #{dto.memberType}
</if>
@@ -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