From 3e38c33a63b434d930f9872c771d66d94b90d1dc Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Wed, 10 Dec 2025 16:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=BB=E8=B4=A6=E5=8F=B7=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../info/persistence/repository/impl/UserRepositoryImpl.java | 5 ++++-
 web-infrastructure/src/main/resources/mapper/UserMapper.xml  | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
index 106beb6..2806872 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@@ -110,7 +110,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "u.");
         queryWrapper.eq("u.delete_enum", "FALSE");
-        queryWrapper.apply("u.id != u.corpinfo_id");
+        if(!ObjectUtils.isEmpty(params.get("noMain"))){
+            queryWrapper.apply("u.id != u.corpinfo_id");
+        }
+
         queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
         String menuPerms = "";
         if (!ObjectUtils.isEmpty(params.get("menuPath"))){
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index dfecc5a..44f13e6 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -71,7 +71,9 @@
         left join department d on d.id = u.department_id
         left join post p on p.id = u.post_id
         <where>
-            u.id != u.corpinfo_id
+            <if test="params.noMain != null">
+                and u.id != u.corpinfo_id
+            </if>
             and u.delete_enum = 'FALSE'
             <if test="params.corpinfoId != null">
                 and u.corpinfo_id = #{params.corpinfoId}