diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index fe89361..50061bd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -193,8 +193,13 @@ public class PersonnelServiceService implements IPersonnelService { @Override public ListPager querySysUser(UserDetailModel model, Pager pager) { Set idList = new HashSet<>(); - idList.addAll(findSysUserIdByDepartmentId(model.getSysUser().getDepartmentId())); - idList.addAll(findSysUserIdByOrganizeCode(model.getSysUser().getOrganizeCode())); + if(model.getSysUser() != null && model.getSysUser().getDepartmentId() != null){ + idList.addAll(findSysUserIdByDepartmentId(model.getSysUser().getDepartmentId())); + } + if(model.getSysUser() != null && model.getSysUser().getOrganizeCode() != null){ + idList.addAll(findSysUserIdByOrganizeCode(model.getSysUser().getOrganizeCode())); + } + if(model.getUserIdList() != null){ model.getUserIdList().forEach(idStr -> idList.add(Long.parseLong(idStr))); }