bugfix:
1. 判断样品信息为空的情况。
This commit is contained in:
@@ -75,14 +75,17 @@ public class ExperimentDeviationEquipmentServiceImpl extends ServiceImpl<Experim
|
|||||||
String sampleId = experimentDeviationEquipment.getSampleId();
|
String sampleId = experimentDeviationEquipment.getSampleId();
|
||||||
if (StringUtils.isNotBlank(sampleId)) {
|
if (StringUtils.isNotBlank(sampleId)) {
|
||||||
ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
|
ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
|
||||||
experimentDeviationEquipment.setSampleInfo(sampleInfo);
|
if (sampleInfo != null) {
|
||||||
experimentDeviationEquipment.setSampleName(sampleInfo.getSampleName());
|
experimentDeviationEquipment.setSampleInfo(sampleInfo);
|
||||||
experimentDeviationEquipment.setSampleType(sampleInfo.getSampleType());
|
experimentDeviationEquipment.setSampleName(sampleInfo.getSampleName());
|
||||||
experimentDeviationEquipment.setSampleModel(sampleInfo.getSampleModel());
|
experimentDeviationEquipment.setSampleType(sampleInfo.getSampleType());
|
||||||
experimentDeviationEquipment.setSampleBatch(sampleInfo.getSampleBatch());
|
experimentDeviationEquipment.setSampleModel(sampleInfo.getSampleModel());
|
||||||
experimentDeviationEquipment.setModelBatch(sampleInfo.getModelBatch());
|
experimentDeviationEquipment.setSampleBatch(sampleInfo.getSampleBatch());
|
||||||
experimentDeviationEquipment.setSampleImage(sampleInfo.getSampleImage());
|
experimentDeviationEquipment.setModelBatch(sampleInfo.getModelBatch());
|
||||||
experimentDeviationEquipment.setSampleManufacturer(sampleInfo.getSampleManufacturer());
|
experimentDeviationEquipment.setSampleImage(sampleInfo.getSampleImage());
|
||||||
|
experimentDeviationEquipment.setSampleManufacturer(sampleInfo.getSampleManufacturer());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user