From 38d5bc10da83442e3d71d74f9f3f051771dcf00a Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 31 Dec 2019 15:13:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=9F=A5=E8=AF=A2=20Bug=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/PersonnelServiceService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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))); }