1

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

@@ -8134,7 +8134,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         continue;
                     }
                     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()){
                             project.setProjectMainId(mainOptional.get().getId());
                             project.setCategoryName(mainOptional.get().getCategoryName());
@@ -8142,14 +8142,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                     }else {
                         project.setProjectMainName(null);
-                        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()){
                             project.setCategoryName(category.get().getName());
                             project.setCategory(category.get().getId());
                         }
                     }
                     if(timeType.getProjectLevelState()==1){
-                        Optional<ProjectLevel> level = projectLevelList.stream().filter(pl -> pl.getProjectLevelName().equals(project.getLevelString())).findFirst();
+                        Optional<ProjectLevel> level = projectLevelList.stream().filter(pl ->pl.getProjectLevelName()!=null&& pl.getProjectLevelName().equals(project.getLevelString())).findFirst();
                         if(level.isPresent()){
                             project.setLevel(level.get().getId());
                         }
@@ -8159,7 +8159,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         project.setInchargerId(user.get().getId());
                         project.setInchargerName(user.get().getName());
                     }
-                    Optional<ProjectStage> stage = projectStageList.stream().filter(ps -> ps.getProjectStageName().equals(project.getCurrentStageName())).findFirst();
+                    Optional<ProjectStage> stage = projectStageList.stream().filter(ps ->ps.getProjectStageName()!=null&& ps.getProjectStageName().equals(project.getCurrentStageName())).findFirst();
                     if(stage.isPresent()){
                         project.setCurrentStageId(stage.get().getId());
                     }else {