From 3d4f5275bee312fd933d279901c1bee8ff9c9eb7 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 21 Feb 2024 13:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E6=A8=A1?= =?UTF-8?q?=E5=9D=97Beta=E8=B0=B1=E5=8A=A0=E8=BD=BD=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E5=88=86=E6=9E=90=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E5=8F=8A=E6=8B=9F=E5=90=88=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/SpectrumAnalysisServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index d65d396c..86f642b6 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -1930,7 +1930,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements map.put("gammaSpectrum", seriseDataList); //判断人工交互的道值与能量对应参数数组是否为空 - if (CollectionUtils.isNotEmpty(betaDataFile.getGammaList())) { + if (Objects.nonNull(betaDataFile.getBgPara()) && CollectionUtils.isNotEmpty(betaDataFile.getGammaList())) { //存储计算参数道值 List xs = new LinkedList(); //存储计算参数能量值 @@ -2151,7 +2151,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements map.put("EToC", fittingParaToUiStr); //判断人工交互的道值与能量对应参数数组是否为空 - if (CollectionUtils.isNotEmpty(betaDataFile.getBetaList())) { + if (Objects.nonNull(betaDataFile.getBgPara()) && CollectionUtils.isNotEmpty(betaDataFile.getBetaList())) { //存储计算参数道值 List xs = new LinkedList(); //存储计算参数能量值