Jelajahi Sumber

判断源头节点null条件

ZhangYanJie 3 bulan lalu
induk
melakukan
fceb84cefb

+ 9 - 3
src/main/java/com/sundata/internalevaluation/calc/calcUnit/IndexCalcUnit.java

@@ -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);
     }