diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index bbde7e2..ce01a8a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -464,28 +464,30 @@ public class ExperimentController extends JeecgController sampleInfoList = v.getSampleInfoList(); List deviationEquipmentList = v.getDeviationEquipmentList(); List deviationConditionList = v.getDeviationConditionList(); - for (int j = 0; j < sampleInfoList.size(); j++) { - ExperimentSampleInfo sampleInfo = sampleInfoList.get(j); - AnnealProcessExportDTO annealProcessExportDTO = new AnnealProcessExportDTO(); + if (CollUtil.isNotEmpty(sampleInfoList)) { + for (int j = 0; j < sampleInfoList.size(); j++) { + ExperimentSampleInfo sampleInfo = sampleInfoList.get(j); + AnnealProcessExportDTO annealProcessExportDTO = new AnnealProcessExportDTO(); - if (CollUtil.isNotEmpty(deviationConditionList) && deviationConditionList.size() > j && ObjUtil.isNotNull( - deviationConditionList.get(j)) - ) { - BeanUtil.copyProperties(deviationConditionList.get(j), annealProcessExportDTO); - } - if (CollUtil.isNotEmpty(deviationEquipmentList) && deviationEquipmentList.size() > j && ObjUtil.isNotNull( - deviationEquipmentList.get(j)) - ) { - BeanUtil.copyProperties(deviationEquipmentList.get(j), annealProcessExportDTO); - } + if (CollUtil.isNotEmpty(deviationConditionList) && deviationConditionList.size() > j && ObjUtil.isNotNull( + deviationConditionList.get(j)) + ) { + BeanUtil.copyProperties(deviationConditionList.get(j), annealProcessExportDTO); + } + if (CollUtil.isNotEmpty(deviationEquipmentList) && deviationEquipmentList.size() > j && ObjUtil.isNotNull( + deviationEquipmentList.get(j)) + ) { + BeanUtil.copyProperties(deviationEquipmentList.get(j), annealProcessExportDTO); + } - annealProcessExportDTO.setSampleName(sampleInfo.getSampleName()); - annealProcessExportDTO.setSampleModel(sampleInfo.getSampleModel()); - annealProcessExportDTO.setSampleType(sampleInfo.getSampleType()); - annealProcessExportDTO.setAnnealTemperature(v.getAnnealTemperature()); - annealProcessExportDTO.setAnnealStartTime(DateUtils.formatDate(v.getAnnealStartTime(), "yyyy-MM-dd HH:mm")); - annealProcessExportDTO.setAnnealEndTime(DateUtils.formatDate(v.getAnnealEndTime(), "yyyy-MM-dd HH:mm")); - annealProcessList.add(annealProcessExportDTO); + annealProcessExportDTO.setSampleName(sampleInfo.getSampleName()); + annealProcessExportDTO.setSampleModel(sampleInfo.getSampleModel()); + annealProcessExportDTO.setSampleType(sampleInfo.getSampleType()); + annealProcessExportDTO.setAnnealTemperature(v.getAnnealTemperature()); + annealProcessExportDTO.setAnnealStartTime(DateUtils.formatDate(v.getAnnealStartTime(), "yyyy-MM-dd HH:mm")); + annealProcessExportDTO.setAnnealEndTime(DateUtils.formatDate(v.getAnnealEndTime(), "yyyy-MM-dd HH:mm")); + annealProcessList.add(annealProcessExportDTO); + } } }); }