[Fix-427] [admin] Task status error when task has stoped

[Fix-427] [admin] Task status error when task has stoped

[Fix-427] [admin] Task status error when task has stoped
fc646434 · aiwenmo · GitHub · 429a25da · 7a6749bf · fc646434
Unverified Commit fc646434 authored Apr 19, 2022 by aiwenmo Committed by GitHub Apr 19, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

TaskServiceImpl.java ...src/main/java/com/dlink/service/impl/TaskServiceImpl.java +5 -5

No files found.
--- a/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+++ b/dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
@@ -223,11 +223,11 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
            if (statement != null) {
                task.setStatement(statement.getStatement());
            }
-            if (Asserts.isNull(task.getJobInstanceId()) || task.getJobInstanceId() == 0) {
-                JobInstance jobInstance = jobInstanceService.getJobInstanceByTaskId(id);
-                if (Asserts.isNotNull(jobInstance) && !JobStatus.isDone(jobInstance.getStatus())) {
-                    task.setJobInstanceId(jobInstance.getId());
-                }
+            JobInstance jobInstance = jobInstanceService.getJobInstanceByTaskId(id);
+            if (Asserts.isNotNull(jobInstance) && !JobStatus.isDone(jobInstance.getStatus())) {
+                task.setJobInstanceId(jobInstance.getId());
+            }else {
+                task.setJobInstanceId(0);
            }
        }
        return task;