From 9fdc708bb853294743cad1b8b38eb76f7ce1d542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 27 Jul 2026 11:08:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(user):=20=E4=BF=AE=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=94=AF=E6=8C=81=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=92=8C=E7=AE=A1=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将用户查询条件中超级管理员判断修改为超级管理员或管理员均可
- 修正了 is_super_admin 字段限制，新增对 is_admin 字段的支持
- 保证查询结果包含超级管理员和管理员用户数据
---
 .../java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
index b16b724..e32027c 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml
@@ -477,7 +477,7 @@
     WHERE u.deleted = 0
       AND u.status = 0
       AND u.phone = #{phone}
-      AND u.is_super_admin = 1
+      AND (u.is_super_admin = 1 OR u.is_admin = 1)
     ORDER BY u.update_time DESC,
              u.create_time DESC,
              u.user_id DESC