Browse Source

Merge pull request #3535 from qiaozhanwei/1.3.2-release

if task is null , set task type is null instead of "null"
pull/3/MERGE
xingchun-chen 4 years ago committed by GitHub
parent
commit
a3f61238f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java

2
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java

@ -1305,7 +1305,7 @@ public class ProcessDefinitionService extends BaseDAGService {
ProcessInstance processInstance = processInstanceList.get(i); ProcessInstance processInstance = processInstanceList.get(i);
TaskInstance taskInstance = taskInstanceMapper.queryByInstanceIdAndName(processInstance.getId(), nodeName); TaskInstance taskInstance = taskInstanceMapper.queryByInstanceIdAndName(processInstance.getId(), nodeName);
if (taskInstance == null) { if (taskInstance == null) {
treeViewDto.getInstances().add(new Instance(-1, "not running", "null")); treeViewDto.getInstances().add(new Instance(-1, "not running", null));
} else { } else {
Date startTime = taskInstance.getStartTime() == null ? new Date() : taskInstance.getStartTime(); Date startTime = taskInstance.getStartTime() == null ? new Date() : taskInstance.getStartTime();
Date endTime = taskInstance.getEndTime() == null ? new Date() : taskInstance.getEndTime(); Date endTime = taskInstance.getEndTime() == null ? new Date() : taskInstance.getEndTime();

Loading…
Cancel
Save