🐛fixed pull bug

open-job · Sep 7, 2023 · faf96ba · faf96ba
1 parent 8db1936
commit faf96ba
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...-admin/src/main/java/io/openjob/server/admin/service/impl/JobInstanceTaskServiceImpl.java b/...-admin/src/main/java/io/openjob/server/admin/service/impl/JobInstanceTaskServiceImpl.java
@@ -210,13 +210,14 @@ private PageVO<ListTaskVO> getTaskListBySecond(ListTaskRequest request) {
 
         // Pull task from worker at first page
         if (NumberUtils.INTEGER_ZERO.equals(request.getPage() - 1)) {
+            Long pullCircleId = 0L;
             JobInstanceTask latestParentTask = this.jobInstanceTaskDAO.getLatestParentTask(request.getJobInstanceId(), TaskConstant.DEFAULT_PARENT_ID);
-            if (Objects.isNull(latestParentTask)) {
-                return pageVO;
+            if (Objects.nonNull(latestParentTask)) {
+                pullCircleId = latestParentTask.getCircleId();
             }
 
             // Add pull tasks
-            List<ListTaskVO> taskList = this.pullTaskListFromWorker(latestParentTask.getCircleId(), jobInstance);
+            List<ListTaskVO> taskList = this.pullTaskListFromWorker(pullCircleId, jobInstance);
             pageVO.getList().addAll(0, taskList);
         }
         return pageVO;