From 3c8fe245e9b43b372eaa8a1bbbb27e5cd4988fe1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 26 三月 2025 16:48:29 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..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}
@@ -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