Browse Source

发起会员不添加子项处理

anderx 8 months ago
parent
commit
6372af5b79

+ 1 - 2
src/main/java/com/goafanti/Interview/service/impl/UserArchivesInterviewServiceImpl.java

@@ -225,8 +225,7 @@ public class UserArchivesInterviewServiceImpl extends BaseMybatisDao<UserArchive
         if (uai!=null){
             res.put("data",uai);
             List<UserArchivesInterview> list = userArchivesInterviewMapper.selectByUidAid(uai.getUid(), uai.getAid());
-            List<UserArchivesInterview> collect = list.stream().filter(e -> !e.getId().equals(uai.getId())).collect(Collectors.toList());
-            res.put("list",collect);
+            res.put("list",list);
         }
         return res;
     }

+ 12 - 9
src/main/java/com/goafanti/order/service/impl/ProjectAsyncService.java

@@ -48,16 +48,19 @@ public class ProjectAsyncService {
 
     private void addSonProject(InputAddTask t) {
         List<InputAddTask> sonList = t.getSonList();
-        for (InputAddTask e : sonList) {
-            InputSonProject sonProject= new InputSonProject();
-            sonProject.setTid(t.getId());
-            sonProject.setServiceYear(e.getServiceYear());
-            sonProject.setTaskComment(e.getTaskComment());
-            sonProject.setHtMember(e.getHtMember());
-            sonProject.setAdditionalDeduction(e.getAdditionalDeduction());
-            sonProject.setRdAwardsubsidy(e.getRdAwardsubsidy());
-            orderProjectService.addMemberSonProject(sonProject);
+        if (sonList != null && !sonList.isEmpty()){
+            for (InputAddTask e : sonList) {
+                InputSonProject sonProject= new InputSonProject();
+                sonProject.setTid(t.getId());
+                sonProject.setServiceYear(e.getServiceYear());
+                sonProject.setTaskComment(e.getTaskComment());
+                sonProject.setHtMember(e.getHtMember());
+                sonProject.setAdditionalDeduction(e.getAdditionalDeduction());
+                sonProject.setRdAwardsubsidy(e.getRdAwardsubsidy());
+                orderProjectService.addMemberSonProject(sonProject);
+            }
         }
+
     }