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 i // List ids = new ArrayList<>(); // ids.add(1999009782763397120L); // Map 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 @@ and u.department_id = #{params.departmentId} + + and u.employment_flag = #{params.employmentFlag} + + + and u.post_id = #{params.postId}