|
@@ -116,9 +116,15 @@ public class IndexCalcUnit extends CalcUnit {
|
|
|
// selectList.stream().map(sourceModel -> new IndexSourceCalcUnit
|
|
|
// (sourceModel.getOtherIndexNo(),"",CalcType.INDEX,Map.of(),sourceModel));
|
|
|
// 结果封装
|
|
|
- resultCalcMap.addAll(indexCalcList);
|
|
|
- resultCalcMap.addAll(dataSetCalcList);
|
|
|
- return new ArrayList<>();
|
|
|
+ if (null != indexCalcList) {
|
|
|
+ resultCalcMap.addAll(indexCalcList);
|
|
|
+ }
|
|
|
+ if (null != dataSetCalcList) {
|
|
|
+ resultCalcMap.addAll(dataSetCalcList);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ return resultCalcMap;
|
|
|
// return ConfigImages.indexCalcUnitListMap.get(this);
|
|
|
}
|
|
|
|