Merge 946c7b0 into c5bde33

calvinjiang · web-flow · commit 8264657fc8be · 2021-11-29T10:20:24.000Z
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/switchtask/SwitchResultVo.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/switchtask/SwitchResultVo.java
@@ -42,6 +42,10 @@ public void setNextNode(Object nextNode) {
             List<String> nextNodeList = new ArrayList<>();
             nextNodeList.add(String.valueOf(nextNode));
             this.nextNode = nextNodeList;
+        } else if (nextNode instanceof Number) {
+            List<String> nextNodeList = new ArrayList<>();
+            nextNodeList.add(nextNode.toString());
+            this.nextNode = nextNodeList;
         } else {
             this.nextNode = (ArrayList) nextNode;
         }
diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
@@ -406,7 +406,7 @@ private static List<String> skipTaskNode4Switch(TaskNode taskNode, Map<String, T
                                                     Map<String, TaskInstance> completeTaskList,
                                                     DAG<String, TaskNode, TaskNodeRelation> dag) {
 
-        SwitchParameters switchParameters = completeTaskList.get(taskNode.getName()).getSwitchDependency();
+        SwitchParameters switchParameters = completeTaskList.get(Long.toString(taskNode.getCode())).getSwitchDependency();
         int resultConditionLocation = switchParameters.getResultConditionLocation();
         List<SwitchResultVo> conditionResultVoList = switchParameters.getDependTaskList();
         List<String> switchTaskList = conditionResultVoList.get(resultConditionLocation).getNextNode();
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java
@@ -210,7 +210,7 @@ public String setTaskParams(String content, String rgex) {
             if (!org.apache.commons.lang.math.NumberUtils.isNumber(value)) {
                 value = "\"" + value + "\"";
             }
-            logger.info("paramName：{}，paramValue{}", paramName, value);
+            logger.info("paramName:{}，paramValue:{}", paramName, value);
             content = content.replace("${" + paramName + "}", value);
         }
         return content;

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ public String setTaskParams(String content, String rgex) {`
`210`	`210`	`if (!org.apache.commons.lang.math.NumberUtils.isNumber(value)) {`
`211`	`211`	`value = "\"" + value + "\"";`
`212`	`212`	`}`
`213`		`- logger.info("paramName：{}，paramValue{}", paramName, value);`
	`213`	`+ logger.info("paramName:{}，paramValue:{}", paramName, value);`
`214`	`214`	`content = content.replace("${" + paramName + "}", value);`
`215`	`215`	`}`
`216`	`216`	`return content;`