Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -172,12 +172,8 @@ public class BArrangeServiceImpl implements BArrangeService {
                 BSubtask bSubtask = new BSubtask();
                 if (subtask.get("businessId") != null){
                     bSubtask.setBusinessId(subtask.getString("businessId"));
-                }
-                if (subtask.get("name") != null){
                     bSubtask.setName(subtask.getString("name"));
                     bSubtaskRepository.updateByPrimaryKeySelective(bSubtask);
-                }
-                if (subtask.get("childList") != null){
                     //先清除原子任务
                     bSubAgencyRepository.deletePervious(subtask.getString("businessId"));
                     JSONArray childList2 = subtask.getJSONArray("childList");
@@ -193,6 +189,27 @@ public class BArrangeServiceImpl implements BArrangeService {
                         bSubAgencyRepository.insertSelective(bSubAgency);
                     }
                 }
+                else {
+                    List<BSubtask> subtaskList = new ArrayList<>();
+                    List<BSubAgency> bSubAgencyList = new ArrayList<>();
+                    bSubtask.setName(subtask.getString("name"));
+                    bSubtask.setArrangeId(bArrange.getBusinessId());
+                    bSubtask.setStatus("0");
+                    UserUtil.setCurrentPersistOperation(bSubtask);
+                    subtaskList.add(bSubtask);
+                    JSONArray childList2 = subtask.getJSONArray("childList");
+                    for(int j = 0; j < childList2.size() ; j++){
+                        JSONObject agency = childList2.getJSONObject(j);
+                        BSubAgency bSubAgency = new BSubAgency();
+                        bSubAgency.setAgencyCode(agency.getString("agencyCode"));
+                        bSubAgency.setStatus("0");
+                        bSubAgency.setSubtaskId(bSubtask.getBusinessId());
+                        UserUtil.setCurrentPersistOperation(bSubAgency);
+                        bSubAgencyList.add(bSubAgency);
+                    }
+                    bArrangeRepository.insertBSubAgency(bSubAgencyList);
+                    bArrangeRepository.insertBSubtask(subtaskList);
+                }
             }
         }
         return new PersistModel(1);