From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 12 ++++++++++++
1 files changed, 12 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..262a4b3 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -67,6 +67,15 @@
AND usr.`status` = #{dto.status}
</if>
<if test="dto.memberType != null ">
+ AND usr.`type` = #{dto.memberType}
+ </if>
+ <if test="dto.memberType != null ">
+ AND usr.`type` = #{dto.memberType}
+ </if>
+ <if test="dto.workStatus != null ">
+ AND m.WORK_STATUS = #{dto.workStatus}
+ </if>
+ <if test="dto.memberType != null ">
AND m.`type` = #{dto.memberType}
</if>
<if test="dto.companyId != null ">
@@ -75,6 +84,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