考勤人员花名册接口功能调整

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.正式.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));