From 94fdc01dacf7a3bc185ca99e98d0864594d34ef1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 10:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 6 +++---
1 files changed, 3 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 0b358d4..1907ebc 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -66,11 +66,11 @@
<if test="dto.status != null ">
AND usr.`status` = #{dto.status}
</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 ">
AND usr.COMPANY_ID = #{dto.companyId}
--
Gitblit v1.9.3