From 680e3fe9760360e6de74e6ea96b07f601d4e2b12 Mon Sep 17 00:00:00 2001 From: srzou Date: Thu, 5 Sep 2024 22:34:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:(1.2.0-beta1):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=B8=AD=E5=9B=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=98=BB=E5=A1=9E=E7=8A=B6=E6=80=81=E8=80=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/task/support/handler/WorkflowBatchHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java index ad105cab..6146a153 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java @@ -188,9 +188,6 @@ public class WorkflowBatchHandler { .in(JobTaskBatch::getTaskBatchStatus, NOT_COMPLETE) .eq(JobTaskBatch::getWorkflowTaskBatchId, workflowTaskBatchId)); - if (CollUtil.isEmpty(jobTaskBatches)) { - return; - } WorkflowTaskBatch workflowTaskBatch = new WorkflowTaskBatch(); workflowTaskBatch.setTaskBatchStatus(JobTaskBatchStatusEnum.STOP.getStatus()); @@ -202,6 +199,9 @@ public class WorkflowBatchHandler { workflowTaskBatchId)); SnailSpringContext.getContext().publishEvent(new WorkflowTaskFailAlarmEvent(workflowTaskBatchId)); + if (CollUtil.isEmpty(jobTaskBatches)) { + return; + } List jobs = jobMapper.selectBatchIds(StreamUtils.toSet(jobTaskBatches, JobTaskBatch::getJobId)); Map jobMap = StreamUtils.toIdentityMap(jobs, Job::getId);