修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -916,8 +916,8 @@ public class ReportController {
             }
 
         }
-        for (Report report : reportList) {
-            if(comTimeType.getReportAuditType()==4){
+        if(comTimeType.getReportAuditType()==4){
+            for (Report report : reportList) {
                 Optional<Project> project = projectList.stream().filter(pl -> pl.getId().equals(report.getProjectId())).findFirst();
                 Optional<ProjectCategory> category = categoryList.stream().filter(cl -> cl.getId().equals(project.get().getCategory())).findFirst();
                 if(category.isPresent()){

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

@@ -1581,7 +1581,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id,project_name,incharger_id,bu_id,category").in("id", assProjectIds));
                 List<ProjectCategory> categoryList = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id",company.getId()));
                 List<Integer> collect = projectList.stream().map(pl -> {
-                    if (!pl.getBuId().equals("")) {
+                    if (pl.getBuId()!=null&&!pl.getBuId().equals("")) {
                         String[] split = pl.getBuId().split(",");
                         return Integer.parseInt(split[split.length - 1]);
                     }
@@ -2574,7 +2574,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().select("id,project_name,incharger_id,bu_id,category").in("id", assProjectIds));
                 List<ProjectCategory> categoryList = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id",company.getId()));
                 List<Integer> collect = projectList.stream().map(pl -> {
-                    if (!pl.getBuId().equals("")) {
+                    if (pl.getBuId()!=null&&!pl.getBuId().equals("")) {
                         String[] split = pl.getBuId().split(",");
                         return Integer.parseInt(split[split.length - 1]);
                     }