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

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -155,7 +155,7 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
             deptEntity.setPersonList(personList);
         }
         //获取父节点
-        List<DeptEntity> returnList = list.stream().filter(t -> t.getParentId() == 0).map(
+        List<DeptEntity> returnList = list.stream().filter(t -> t.getParentId() == 0 || t.getParentId() == -1).map(
                 m -> {
                     m.setChildren(getChildren(m, list));
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffVo.java

@@ -34,4 +34,6 @@ public class StaffVo extends BaseEntityLong {
 
     private List <Long> deptIdList;
 
+    /** 员工状态(1.正式,2.试用,3.离职)列表 */
+    private List <Integer> statusList;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -359,6 +359,9 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                 params.setDeptIdList(deptIdList);
             }
         }
+        if(params.getStatus()==null && CollectionUtils.isEmpty(params.getStatusList())){
+            params.setStatusList(Arrays.asList(StaffSatusEnum.正式.getValue(), StaffSatusEnum.试用.getValue()));
+        }
         return params;
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java

@@ -96,9 +96,9 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
     @Override
     protected int doListAfter(StaffEntity query, Map<String, Object> model, Context context) throws AppException {
         //todo 员工信息统计--员工关系统计
-        StaffInfoVo staffInfoVo = this.service.queryAll(context);
-        staffInfoVo.setRefreshDate(new Date());
-        model.put("staff", staffInfoVo);
+//        StaffInfoVo staffInfoVo = this.service.queryAll(context);
+//        staffInfoVo.setRefreshDate(new Date());
+//        model.put("staff", staffInfoVo);
         return super.doListAfter(query, model, context);
     }