cs 2 năm trước cách đây
mục cha
commit
055ffa8ac6

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -3952,7 +3952,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全公司工时");
             //获取部门的所有子部门
             List<Department> departments = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
-            List<Integer> branchDepartment = departments.stream().map((d) -> d.getDepartmentId()).collect(Collectors.toList());
+            List<Integer> branchDepartment = null;
             if(departmentId != null){
                 branchDepartment = departmentService.getBranchDepartment(departmentId,departments);
             }