From 4b8fda000f9f600ba5187e738278b340b55ebd7c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 18 十二月 2024 18:41:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 3 +++
1 files changed, 3 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 9bc91f7..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>
--
Gitblit v1.9.3