From e6b2d1cee20c51d2a4f4ae5430d305e19fe0c239 Mon Sep 17 00:00:00 2001 From: dengchun Date: Mon, 5 May 2025 17:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AF=95=E9=AA=8C=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/database/controller/ExperimentController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index ce01a8a..7553dbc 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -653,8 +653,11 @@ public class ExperimentController extends JeecgController sampleInfoList = radiationProcess.getSampleInfoList(); detail.setRadiateType(name); - detail.setSampleModel(sampleInfoList.stream().map(s -> s.getSampleModel()).collect(Collectors.joining(","))); - detail.setSampleType(sampleInfoList.stream().map(s -> s.getSampleType()).collect(Collectors.joining(","))); + if (CollUtil.isNotEmpty(sampleInfoList)) { + detail.setSampleModel(sampleInfoList.stream().map(s -> s.getSampleModel()).collect(Collectors.joining(","))); + detail.setSampleType(sampleInfoList.stream().map(s -> s.getSampleType()).collect(Collectors.joining(","))); + } + //detail.setMeasurementRate(radiationProcess.getMeasurementRate()); detail.setPlannedMeasurementRate( xgy.stream().filter(v -> StringUtils.isNotBlank(v.getPlannedMeasurementRate())).map(v -> v.getPlannedMeasurementRate())