diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java index e721403..bd477cb 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java @@ -26,6 +26,7 @@ public class UserPageQry extends PageQuery { */ private Long eqCorpinfoId; private Long eqDepartmentId; + private Long[] inDepartmentId; private Long eqPostId; private Long eqRoleId; @ApiModelProperty(value = "是否流动人员,1-流动,0-固定人员") diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 77c7201..e4d03ca 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -347,11 +347,19 @@ (u.flow_flag = 1 AND cp.id = #{params.eqDepartmentId} ) ) - + AND ( - (u.flow_flag = 0 AND u.department_id = #{params.eqDepartmentId} ) + (u.flow_flag = 0 AND u.department_id IN + + #{departmentId} + + ) OR - (u.flow_flag = 1 AND cp.id = #{params.eqDepartmentId} ) + (u.flow_flag = 1 AND cp.id IN + + #{departmentId} + + ) )