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 35c5541..96dd3e4 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 @@ -88,10 +88,15 @@ public class ExperimentReviewServiceImpl extends ServiceImpl().eq(ExperimentReview::getExperimentId, experimentId) .eq(ExperimentReview::getSampleId, sampleId), false); + if (Objects.isNull(experimentReview)) { + return null; + } List detailList = experimentReviewDetailService.getBySample(experimentId, sampleId); - List matchedRuleList = detailList.stream().map(v -> experimentReviewRuleService.getById(v.getRuleId())) - .filter(v -> v != null).collect(Collectors.toList()); - experimentReview.setMatchedRuleList(matchedRuleList); + if (CollUtil.isNotEmpty(detailList)) { + List matchedRuleList = detailList.stream().map(v -> experimentReviewRuleService.getById(v.getRuleId())) + .filter(v -> v != null).collect(Collectors.toList()); + experimentReview.setMatchedRuleList(matchedRuleList); + } Experiment experiment = experimentService.getById(experimentId); ExperimentSampleInfo sampleInfo = experimentSampleInfoService.getById(sampleId); experimentReview.setExperimentName(experiment.getName());