Commit e6b491be11fa0e9bce42c9c67d761becf5e19edc

Authored by 杨鸣坤
1 parent e1404cd7

接口联调,修复报错

@@ -95,7 +95,8 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio @@ -95,7 +95,8 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio
95 95
96 @Override 96 @Override
97 public TkInspectionPlanDTO save(TkInspectionPlanDTO tkInspectionPlanDTO, boolean changeStatus) { 97 public TkInspectionPlanDTO save(TkInspectionPlanDTO tkInspectionPlanDTO, boolean changeStatus) {
98 - List<TkCheckDetailsDTO> checkDetailsDTOList = new ArrayList<>(tkInspectionPlanDTO.getTkCheckDetailsDTOList()); 98 + List<TkCheckDetailsDTO> checkDetailsDTOList = CollectionUtils.isEmpty(tkInspectionPlanDTO.getTkCheckDetailsDTOList()) ?
  99 + new ArrayList<>(0) : new ArrayList<>(tkInspectionPlanDTO.getTkCheckDetailsDTOList());
99 checkDto(tkInspectionPlanDTO); 100 checkDto(tkInspectionPlanDTO);
100 TkInspectionPlanEntity entity = new TkInspectionPlanEntity(); 101 TkInspectionPlanEntity entity = new TkInspectionPlanEntity();
101 if (StringUtils.isBlank(tkInspectionPlanDTO.getId())) { 102 if (StringUtils.isBlank(tkInspectionPlanDTO.getId())) {
@@ -118,7 +118,8 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect @@ -118,7 +118,8 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect
118 118
119 @Override 119 @Override
120 public TkInspectionRecordDTO save(TkInspectionRecordDTO tkInspectionRecordDTO) { 120 public TkInspectionRecordDTO save(TkInspectionRecordDTO tkInspectionRecordDTO) {
121 - List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList = new ArrayList<>(tkInspectionRecordDTO.getTkInspectionDetailsDTOList()); 121 + List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList = CollectionUtils.isEmpty(tkInspectionRecordDTO.getTkInspectionDetailsDTOList()) ?
  122 + new ArrayList<>(0) : new ArrayList<>(tkInspectionRecordDTO.getTkInspectionDetailsDTOList());
122 checkDto(tkInspectionRecordDTO); 123 checkDto(tkInspectionRecordDTO);
123 TkInspectionRecordEntity entity = new TkInspectionRecordEntity(); 124 TkInspectionRecordEntity entity = new TkInspectionRecordEntity();
124 if (StringUtils.isBlank(tkInspectionRecordDTO.getId())) { 125 if (StringUtils.isBlank(tkInspectionRecordDTO.getId())) {