cherry pick apache#4288 to 1.3.4-prepare

lenboo · Dec 16, 2020 · c159017 · c159017
1 parent e6118b8
commit c159017
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...heduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java b/...heduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
@@ -66,11 +66,13 @@ public static String convertParameterPlaceholders(String parameterString, Map<St
         }
         Date cronTime;
         if (parameterMap != null && !parameterMap.isEmpty()) {
+            // replace variable ${} form,refers to the replacement of system variables and custom variables
+            parameterString = PlaceholderUtils.replacePlaceholders(parameterString, parameterMap, true);
+        }
+        if (parameterMap != null && null != parameterMap.get(Constants.PARAMETER_DATETIME)) {
             //Get current time, schedule execute time
             String cronTimeStr = parameterMap.get(Constants.PARAMETER_DATETIME);
             cronTime = DateUtils.parse(cronTimeStr, Constants.PARAMETER_FORMAT_TIME);
-            // replace variable ${} form,refers to the replacement of system variables and custom variables
-            parameterString = PlaceholderUtils.replacePlaceholders(parameterString, parameterMap, true);
         } else {
             cronTime = new Date();
         }