From cb739768279ddc315fb4687b1856f4344193bbb1 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Fri, 18 Jul 2025 22:42:57 +0800
Subject: [PATCH] fix NPE

---
 .../service/impl/ExperimentReviewServiceImpl.java         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
index 438747b..486d992 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
@@ -109,8 +109,12 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
         }
         Experiment experiment = experimentService.getById(experimentId);
         ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId);
-        experimentReview.setExperimentName(experiment.getName());
-        experimentReview.setSampleName(sampleInfo.getSampleName());
+        if (Objects.nonNull(experiment)) {
+            experimentReview.setExperimentName(experiment.getName());
+        }
+        if (Objects.nonNull(sampleInfo)) {
+            experimentReview.setSampleName(sampleInfo.getSampleName());
+        }
         return experimentReview;
     }