From 94c2c1847b5586a8849e81ff576d7500e937fc19 Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Mon, 5 Jan 2026 15:13:33 +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=E6=9D=A1=E4=BB=B6=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=9C=A8=E8=81=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java | 3 ++-
 .../persistence/repository/impl/UserRepositoryImpl.java     | 6 ++++--
 web-infrastructure/src/main/resources/mapper/UserMapper.xml | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java
index 75a8bb14..b0613b94 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java
@@ -26,12 +26,13 @@ public class UserQryCmd {
     private String eqCorpinfoId;
     private String eqDepartmentId;
     private String eqPostId;
-    private Integer eqEmploymentFlag;
+    private String eqEmploymentFlag;
 
     private Long corpinfoId;
     private Long departmentId;
     private Long postId;
     private String username;
     private Integer noMain;
+    private String isMyCorp;
 }
 
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 9a91efc6..ce97a749 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
@@ -141,8 +141,10 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
 //        List<Long> ids = new ArrayList<>();
 //        ids.add(1999009782763397120L);
 //        Map<Long, String> sd1 = zcloudDepartmentFacade.listFullName(ids);
-
-        if (ObjectUtils.isEmpty(params.get("corpinfoId"))) {
+        if (!ObjectUtils.isEmpty(params.get("eqEmploymentFlag"))){
+            params.put("employmentFlag", params.get("eqEmploymentFlag"));
+        }
+        if (!ObjectUtils.isEmpty(params.get("isMyCorp"))) {
             SSOUser ssoUser = AuthContext.getCurrentUser();
             params.put("corpinfoId", ssoUser.getTenantId());
         }
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index 9e9818ee..364b57a7 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -81,6 +81,11 @@
             <if test="params.departmentId != null">
                 and u.department_id = #{params.departmentId}
             </if>
+            <if test="params.employmentFlag != null">
+                and u.employment_flag = #{params.employmentFlag}
+            </if>
+
+
             <if test="params.postId != null">
                 and u.post_id = #{params.postId}
             </if>