From 2717e319c45a51a7e3fdca1d0327fed92655cb95 Mon Sep 17 00:00:00 2001 From: ls Date: Thu, 21 Nov 2024 11:50:56 +0800 Subject: [PATCH] update --- .../database/controller/ExperimentReportController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java index 4baf68f..872773b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java @@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import java.util.Arrays; +import java.util.Optional; /** * @Description: 试验报告 @@ -72,7 +73,7 @@ public class ExperimentReportController extends JeecgController pageList = experimentReportService.page(page, queryWrapper); pageList.getRecords().forEach(v -> { ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType()); - v.setFileUrl(experimentDoc.getFilePath()); + v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null)); }); return Result.OK(pageList); } @@ -177,7 +178,7 @@ public class ExperimentReportController extends JeecgController