Merge pull request #3535 from qiaozhanwei/1.3.2-release

if task is null , set task type is null instead of "null"
apache · Aug 18, 2020 · a3f6123 · a3f6123
2 parents 276c599 + 1b5a817
commit a3f6123
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...r-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java b/...r-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
@@ -1305,7 +1305,7 @@ public Map<String, Object> viewTree(Integer processId, Integer limit) throws Exc
                     ProcessInstance processInstance = processInstanceList.get(i);
                     TaskInstance taskInstance = taskInstanceMapper.queryByInstanceIdAndName(processInstance.getId(), nodeName);
                     if (taskInstance == null) {
-                        treeViewDto.getInstances().add(new Instance(-1, "not running", "null"));
+                        treeViewDto.getInstances().add(new Instance(-1, "not running", null));
                     } else {
                         Date startTime = taskInstance.getStartTime() == null ? new Date() : taskInstance.getStartTime();
                         Date endTime = taskInstance.getEndTime() == null ? new Date() : taskInstance.getEndTime();