diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java index 1f306fd424554a6c1d17f785d9d0a9d543df2731..f53c53b8beeb0b187c3433f4ae4aef713ef02833 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java @@ -142,7 +142,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity DeptEntity deptEntity = iterator.next(); StaffQuery staffQuery = new StaffQuery(); staffQuery.setDeptId(deptEntity.getId()); - staffQuery.setStatusNotList(Arrays.asList(StaffSatusEnum.绂昏亴.getValue())); + staffQuery.setStatusList(Arrays.asList(StaffSatusEnum.姝e紡.getValue(), StaffSatusEnum.璇曠敤.getValue())); List<StaffEntity> staffEntities = staffService.find(staffQuery); List<Map<String, Object>> personList = new ArrayList<>(); staffEntities.forEach(item -> { @@ -155,7 +155,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity deptEntity.setPersonList(personList); } //鑾峰彇鐖惰妭鐐� - List<DeptEntity> returnList = list.stream().filter(t -> t.getParentId() == 0 || t.getParentId() == -1).map( + List<DeptEntity> returnList = list.stream().filter(t -> t.getParentId() == 0).map( m -> { m.setChildren(getChildren(m, list));