任务列表模板

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

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -86,11 +87,13 @@ public class GroupTemplateServiceImpl extends ServiceImpl<GroupTemplateMapper, G
                         filterTaskList.forEach(f->{
                             GtemplateTask item = GtemplateTask.fromTask(f);
                             item.setGtemplateId(template.getId());
-                            String stagesName = stagesList.stream().filter(s->s.getId().equals(f.getStagesId())).findFirst().get().getStagesName();
-
-                            Integer tmpSid = tmpstagesList.stream().filter(tmp->tmp.getStagesName().equals(stagesName)).findFirst().get().getId();
-                            item.setTstagesId(tmpSid);
-                            gtemplateTaskList.add(item);
+                            Optional<Stages> first = stagesList.stream().filter(s -> s.getId().equals(f.getStagesId())).findFirst();
+                            if(first.isPresent()){
+                                String stagesName = first.get().getStagesName();
+                                Integer tmpSid = tmpstagesList.stream().filter(tmp->tmp.getStagesName().equals(stagesName)).findFirst().get().getId();
+                                item.setTstagesId(tmpSid);
+                                gtemplateTaskList.add(item);
+                            }
                         });
                     }