修改

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

@@ -7975,7 +7975,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             if(projectList!=null &&projectList.size()>0){
                 for (Project project : projectList) {
                     if(timeType.getMainProjectState()==1){
-                        Optional<ProjectMain> mainOptional = projectMainList.stream().filter(pm -> pm.getName().equals(project.getProjectMainName())).findFirst();
+                        Optional<ProjectMain> mainOptional = projectMainList.stream().filter(pm ->pm.getName()!=null&& pm.getName().equals(project.getProjectMainName())).findFirst();
                         if(!mainOptional.isPresent()){
                             ProjectMain projectMain=new ProjectMain();
                             projectMain.setCompanyId(thirdPartyInterface.getCompanyId());
@@ -7984,7 +7984,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             projectMainList.add(projectMain);
                         }
                     }
-                    Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc -> pc.getName().equals(project.getCategoryName())).findFirst();
+                    Optional<ProjectCategory> category = projectCategoryList.stream().filter(pc ->pc.getName()!=null&& pc.getName().equals(project.getCategoryName())).findFirst();
                     if(!category.isPresent()){
                         ProjectCategory projectCategory=new ProjectCategory();
                         projectCategory.setCompanyId(thirdPartyInterface.getCompanyId());