diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java
index 1795d1a..e038d31 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java
@@ -75,14 +75,17 @@ public class ExperimentDeviationEquipmentServiceImpl extends ServiceImpl<Experim
         String sampleId = experimentDeviationEquipment.getSampleId();
         if (StringUtils.isNotBlank(sampleId)) {
             ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
-            experimentDeviationEquipment.setSampleInfo(sampleInfo);
-            experimentDeviationEquipment.setSampleName(sampleInfo.getSampleName());
-            experimentDeviationEquipment.setSampleType(sampleInfo.getSampleType());
-            experimentDeviationEquipment.setSampleModel(sampleInfo.getSampleModel());
-            experimentDeviationEquipment.setSampleBatch(sampleInfo.getSampleBatch());
-            experimentDeviationEquipment.setModelBatch(sampleInfo.getModelBatch());
-            experimentDeviationEquipment.setSampleImage(sampleInfo.getSampleImage());
-            experimentDeviationEquipment.setSampleManufacturer(sampleInfo.getSampleManufacturer());
+            if (sampleInfo != null) {
+                experimentDeviationEquipment.setSampleInfo(sampleInfo);
+                experimentDeviationEquipment.setSampleName(sampleInfo.getSampleName());
+                experimentDeviationEquipment.setSampleType(sampleInfo.getSampleType());
+                experimentDeviationEquipment.setSampleModel(sampleInfo.getSampleModel());
+                experimentDeviationEquipment.setSampleBatch(sampleInfo.getSampleBatch());
+                experimentDeviationEquipment.setModelBatch(sampleInfo.getModelBatch());
+                experimentDeviationEquipment.setSampleImage(sampleInfo.getSampleImage());
+                experimentDeviationEquipment.setSampleManufacturer(sampleInfo.getSampleManufacturer());
+            }
+
         }
     }