diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java index 686642dbdd..80073d9c07 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java @@ -30,6 +30,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -152,7 +153,7 @@ public abstract class AbstractParameters implements IParameters { ArrayNode paramsByJson = JSONUtils.parseArray(json); Iterator listIterator = paramsByJson.iterator(); while (listIterator.hasNext()) { - Map param = JSONUtils.toMap(listIterator.next().toString(), String.class, String.class); + Map param = JSONUtils.parseObject(listIterator.next().toString(), new TypeReference>() {}); allParams.add(param); } return allParams; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlParameters.java index 59259a53ef..bcdf4aab75 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlParameters.java @@ -251,9 +251,9 @@ public class SqlParameters extends AbstractParameters { sqlResultFormat.put(key, new ArrayList<>()); } for (Map info : sqlResult) { - for (String key : info.keySet()) { - sqlResultFormat.get(key).add(String.valueOf(info.get(key))); - } + info.forEach((key, value) -> { + sqlResultFormat.get(key).add(value); + }); } for (Property info : outProperty) { if (info.getType() == DataType.LIST) {