工时成本统计部门子部门数据修复

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DepartmentServiceImpl.java

@@ -306,6 +306,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                     }
                 }else {
                     deptIds=new ArrayList<>();
+                    //是不是要加
                     deptIds.add(-1);
                 }
             }
@@ -315,13 +316,12 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 if (deptIds == null) {
                     //查看全公司的
                     queryWrapper.isNull("superior_id");
+                }else {
+                    queryWrapper.in("department_id",deptIds);
                 }
             } else {
                 queryWrapper.eq("superior_id", parentDeptId);
             }
-            if(deptIds != null){
-                queryWrapper.in("department_id",deptIds);
-            }
             //获取第一级部门
             System.out.println(deptIds);
             List<Department> masterList = departmentMapper.selectList(queryWrapper);