From 19d3f642af647f35dde29d328c24b1edacd0124e Mon Sep 17 00:00:00 2001 From: linquan <1175687813@qq.com> Date: Tue, 31 Aug 2021 15:14:00 +0800 Subject: [PATCH] [FIX-#6007]Wrong complement date (#6068) --- .../server/worker/task/sql/SqlTask.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java index f021cb74c..1b29452f9 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java @@ -182,18 +182,14 @@ public class SqlTask extends AbstractTask { sqlParameters.getLocalParametersMap(), CommandType.of(taskExecutionContext.getCmdTypeIfComplement()), taskExecutionContext.getScheduleTime()); - if(MapUtils.isEmpty(paramsMap)){ - paramsMap=new HashMap<>(); + if (paramsMap == null) { + sqlBuilder.append(sql); + return new SqlBinds(sqlBuilder.toString(), sqlParamsMap); } if (MapUtils.isNotEmpty(taskExecutionContext.getParamsMap())){ paramsMap.putAll(taskExecutionContext.getParamsMap()); } // spell SQL according to the final user-defined variable - if(paramsMap.isEmpty()){ - sqlBuilder.append(sql); - return new SqlBinds(sqlBuilder.toString(), sqlParamsMap); - } - if (StringUtils.isNotEmpty(sqlParameters.getTitle())){ String title = ParameterUtils.convertParameterPlaceholders(sqlParameters.getTitle(), ParamUtils.convert(paramsMap)); -- GitLab