From d262f5d77f09d75dc4f0bdc6cd747551eb8d4764 Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Sat, 26 Jul 2025 18:20:35 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=201.=20=E5=88=A4=E6=96=AD=E6=A0=B7?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...perimentDeviationEquipmentServiceImpl.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

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());
+            }
+
         }
     }