From cdc16bed0dc6002034ed2ddf6073202ea702c0a1 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 5 Aug 2025 23:19:42 +0800
Subject: [PATCH] update

---
 .../service/impl/ExperimentDeviationConditionServiceImpl.java | 4 ++++
 .../service/impl/ExperimentIrradiationBoardServiceImpl.java   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationConditionServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationConditionServiceImpl.java
index 42b84ad..82697a3 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationConditionServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationConditionServiceImpl.java
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -47,6 +48,9 @@ public class ExperimentDeviationConditionServiceImpl extends ServiceImpl<Experim
         String sampleId = experimentDeviationCondition.getSampleId();
         if (StringUtils.isNotBlank(sampleId)) {
             ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
+            if (Objects.isNull(sampleInfo)) {
+                return;
+            }
             experimentDeviationCondition.setSampleInfo(sampleInfo);
             experimentDeviationCondition.setSampleName(sampleInfo.getSampleName());
             experimentDeviationCondition.setSampleType(sampleInfo.getSampleType());
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java
index 50bb9af..192a1d5 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentIrradiationBoardServiceImpl.java
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -47,6 +48,9 @@ public class ExperimentIrradiationBoardServiceImpl extends ServiceImpl<Experimen
         String sampleId = experimentIrradiationBoard.getSampleId();
         if (StringUtils.isNotBlank(sampleId)) {
             ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
+            if (Objects.isNull(sampleInfo)) {
+                return;
+            }
             experimentIrradiationBoard.setSampleInfo(sampleInfo);
             experimentIrradiationBoard.setSampleName(sampleInfo.getSampleName());
             experimentIrradiationBoard.setSampleType(sampleInfo.getSampleType());