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 i // List ids = new ArrayList<>(); // ids.add(1999009782763397120L); // Map 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();