From 96a2b1c68aa545abbf8245b0b2859b342fa6e63d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 10:18:19 +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 |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 16a7154..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>
@@ -75,6 +78,9 @@
       <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>
     </where>
     ${orderByClause}
   </select>

--
Gitblit v1.9.3