生产处置单内部审批提交

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

@@ -318,28 +318,44 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     @Override
     public R fill(ReviewSheetDetailVO vo) {
         log.info("ReviewSheetDetailVO vo = {}", vo.toString());
-        // 关联rsId
+
-        for (ReviewFaultVO voF : vo.getFaultList()) {
-            voF.setReviewSheetId(vo.getId());
-        }
         // 删除
         if (StringUtils.isNotBlank(vo.getFaultDeleteIds())) {
             faultService.deleteLogic(Func.toLongList(vo.getFaultDeleteIds()));
         }
-        List<ReviewFault> listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class);
+
+        List<ReviewFault> listF = null;
+
+        if(null != vo.getFaultList() && vo.getFaultList().size() > 0){
+            // 关联rsId
+            for (ReviewFaultVO voF : vo.getFaultList()) {
+                voF.setReviewSheetId(vo.getId());
+            }
+            listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class);
             // 保存 或 更新
             faultService.saveOrUpdateBatch(listF);
-        // 关联rsId
-        for (ReviewDutyVO voD : vo.getDutyList()) {
-            voD.setReviewSheetId(vo.getId());
         }
+
+
+
         // 删除
         if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) {
             dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds()));
         }
-        List<ReviewDuty> listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class);
+
+
+        List<ReviewDuty> listD = null;
+        if(null != vo.getDutyList() && vo.getDutyList().size() > 0){
+            // 关联rsId
+            for (ReviewDutyVO voD : vo.getDutyList()) {
+                voD.setReviewSheetId(vo.getId());
+            }
+            listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class);
             // 保存 或 更新
             dutyService.saveOrUpdateBatch(listD);
+        }
+
+
         // 审理单
         ReviewSheet rs = getById(vo.getId()); // 从数据库中查到
         log.info("ReviewSheet rs = {}", rs);
@@ -403,6 +419,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
 
             List<ReviewDutyDTO> vods = new ArrayList<>();
 
+            if(null != listD && listD.size() > 0){
                 for(ReviewDuty vod : listD){
                     ReviewDutyDTO vodDTO = new ReviewDutyDTO();
                     vodDTO.setTrialId(vod.getReviewSheetId()+"");
@@ -411,9 +428,10 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
                     vodDTO.setCorrBatchNo(vod.getRelevantBatch());
                     vods.add(vodDTO);
                 }
-
+            }
 
             List<ReviewFaultDTO> vofs = new ArrayList<>();
+            if(null != listF && listF.size() > 0){
                 for(ReviewFault vof : listF){
                     ReviewFaultDTO vofDTO = new ReviewFaultDTO();
                     vofDTO.setTrialId(vof.getReviewSheetId()+"");
@@ -425,6 +443,8 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
                     vofDTO.setDescribe(vof.getMemo());
                     vofs.add(vofDTO);
                 }
+            }
+
 
 //            JSONObject obj = new JSONObject();
 //            obj.put("qmsRepairApplyDTO", dto);