Merge remote-tracking branch 'origin/master'

src/main/java/com/sundata/internalevaluation/calc/calcUnit/DataSourcesCalcUnit.java

@@ -81,7 +81,7 @@ public class DataSourcesCalcUnit extends CalcUnit {
         //for (DataSourcesModel model : dataList) {
             List<CalcUnit> inputList = dataSourcesModel.getInputParam().stream().map(inputParam ->
                     new InputParamCalcUnit(inputParam.getParamNo(),inputParam.getParamName(),CalcType.INPUTPARAM,Map.of(),inputParam)).collect(Collectors.toList());
-            List<CalcUnit> queryList = dataSourcesModel.getQueryLogic().stream().map(queryParam -> new QueryLogicCalcUnit(queryParam.getQueryLogicNo(),queryParam.getScriptDescription(),CalcType.QUERYLOGIC,Map.of(),queryParam)).collect(Collectors.toList());;
+            List<CalcUnit> queryList = dataSourcesModel.getQueryLogic().stream().map(queryParam -> new QueryLogicCalcUnit(queryParam.getDataItemName(),queryParam.getScriptDescription(),CalcType.QUERYLOGIC,Map.of(),queryParam)).collect(Collectors.toList());;
         List<CalcUnit> itemList = dataSourcesModel.getDataItemConfig().stream().map(itemParam -> new DataItemCalcUnit(itemParam.getDataItemNo(),itemParam.getDataItemName(),CalcType.DATAITEM,Map.of(),itemParam)).collect(Collectors.toList());
         //}
         inputList.addAll(queryList);