From 9673af71a3521fb9997c6828af7f345aff9c7298 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 29 Jun 2026 13:57:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(config):=20=E4=BF=AE=E5=A4=8D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8A=A0=E8=BD=BD=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start/src/main/resources/bootstrap.yml                    | 8 ++++----
 .../persistence/repository/impl/UserRepositoryImpl.java   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml
index ea7eb2ef..f467a2cb 100644
--- a/start/src/main/resources/bootstrap.yml
+++ b/start/src/main/resources/bootstrap.yml
@@ -3,8 +3,8 @@ spring:
     import:
 #      - classpath:nacos.yml
 #      - classpath:sdk.yml
-#      - classpath:nacos-prod.yml
-#      - classpath:sdk-prod.yml
-      - classpath:nacos-prod2.yml
-      - classpath:sdk-prod2.yml
+      - classpath:nacos-prod.yml
+      - classpath:sdk-prod.yml
+#      - classpath:nacos-prod2.yml
+#      - classpath:sdk-prod2.yml
       - classpath:swagger.yml
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 9aeba000..15de7ad5 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
@@ -176,8 +176,8 @@ 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("eqEmploymentFlag"))) {
-            params.put("employmentFlag", params.get("eqEmploymentFlag"));
+        if (!ObjectUtils.isEmpty(params.get("employmentFlag"))) {
+            params.put("employmentFlag", params.get("employmentFlag"));
         }
         if (!ObjectUtils.isEmpty(params.get("isMyCorp"))) {
             SSOUser ssoUser = AuthContext.getCurrentUser();