修改

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

@@ -3981,12 +3981,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         msg.setError("子项目["+row.getCell(4).getStringCellValue()+"]不存在");
                         return msg;
                     }
-                    Optional<SubProject> subProject = allSubProjectList.stream().filter(al -> al.getName().equals(row.getCell(4).getStringCellValue())).findFirst();
-                    subP=subProject.get();
-                    if(!subProject.get().getProjectId().equals(project.get().getId())){
+                    Optional<SubProject> subProject = allSubProjectList.stream().filter(al -> al.getName().equals(row.getCell(4).getStringCellValue())&&al.getProjectId().equals(project.get().getId())).findFirst();
+                    if(!subProject.isPresent()){
                         msg.setError("子项目["+subProject.get().getName()+"]不属于项目["+project.get().getProjectName()+"]");
                         return msg;
                     }
+                    subP=subProject.get();
                 }
                 String stringCellValue = row.getCell(6).getStringCellValue();
                 double time=0;