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(); //存储计算参数能量值