diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java index a33b05a..7d65e3f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java @@ -68,10 +68,14 @@ public class UserInfoManage { List userIdList = getRoleCompliantUserIdList(req.getUserRoleList()); if (userIdList != null && userIdList.size() == 0) { + pageVo.setRecords(new ArrayList<>()); + pageVo.setTotal(0L); return pageVo; } List compliantOrgEmpCodeList = getCompliantOrgEmpCodeList(req.getOrgName(), orgCode, regionId); if (compliantOrgEmpCodeList != null && compliantOrgEmpCodeList.size() == 0) { + pageVo.setRecords(new ArrayList<>()); + pageVo.setTotal(0L); return pageVo; } @@ -123,7 +127,7 @@ public class UserInfoManage { } private List getCompliantOrgEmpCodeList(String orgName, String orgCode, Long regionId) { - if (Objects.nonNull(regionId)&& regionId == 331100L){ + if (Objects.nonNull(regionId) && regionId == 331100L) { // 丽水默认查全部 regionId = null; }