|
|
@ -193,8 +193,13 @@ public class PersonnelServiceService implements IPersonnelService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public ListPager<SysUser> querySysUser(UserDetailModel model, Pager pager) {
|
|
|
|
public ListPager<SysUser> querySysUser(UserDetailModel model, Pager pager) {
|
|
|
|
Set<Long> idList = new HashSet<>();
|
|
|
|
Set<Long> idList = new HashSet<>();
|
|
|
|
|
|
|
|
if(model.getSysUser() != null && model.getSysUser().getDepartmentId() != null){
|
|
|
|
idList.addAll(findSysUserIdByDepartmentId(model.getSysUser().getDepartmentId()));
|
|
|
|
idList.addAll(findSysUserIdByDepartmentId(model.getSysUser().getDepartmentId()));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(model.getSysUser() != null && model.getSysUser().getOrganizeCode() != null){
|
|
|
|
idList.addAll(findSysUserIdByOrganizeCode(model.getSysUser().getOrganizeCode()));
|
|
|
|
idList.addAll(findSysUserIdByOrganizeCode(model.getSysUser().getOrganizeCode()));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if(model.getUserIdList() != null){
|
|
|
|
if(model.getUserIdList() != null){
|
|
|
|
model.getUserIdList().forEach(idStr -> idList.add(Long.parseLong(idStr)));
|
|
|
|
model.getUserIdList().forEach(idStr -> idList.add(Long.parseLong(idStr)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|