From d514f26194473fa5762c0817bceb892fa697c2b5 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Tue, 16 Jan 2024 09:03:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=202.6.0=201.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=BB=84=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/job/task/support/dispatch/ScanJobTaskActor.java | 2 +- .../server/job/task/support/dispatch/ScanWorkflowTaskActor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java index 1820ae6e..e5c61a1e 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java @@ -181,7 +181,7 @@ public class ScanJobTaskActor extends AbstractActor { List groupConfigs = groupConfigMapper.selectList(new LambdaQueryWrapper() .select(GroupConfig::getGroupName) .eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus()) - .eq(GroupConfig::getGroupName, jobs.stream().map(Job::getGroupName).collect(Collectors.toList()))) + .in(GroupConfig::getGroupName, jobs.stream().map(Job::getGroupName).collect(Collectors.toList()))) .stream().map(GroupConfig::getGroupName).collect(Collectors.toList()); jobs = jobs.stream().filter(job -> groupConfigs.contains(job.getGroupName())).collect(Collectors.toList()); } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanWorkflowTaskActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanWorkflowTaskActor.java index 9ca818a5..71718abd 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanWorkflowTaskActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanWorkflowTaskActor.java @@ -144,7 +144,7 @@ public class ScanWorkflowTaskActor extends AbstractActor { List groupConfigs = groupConfigMapper.selectList(new LambdaQueryWrapper() .select(GroupConfig::getGroupName) .eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus()) - .eq(GroupConfig::getGroupName, workflows.stream().map(Workflow::getGroupName).collect(Collectors.toList()))) + .in(GroupConfig::getGroupName, workflows.stream().map(Workflow::getGroupName).collect(Collectors.toList()))) .stream().map(GroupConfig::getGroupName).collect(Collectors.toList()); workflows = workflows.stream().filter(workflow -> groupConfigs.contains(workflow.getGroupName())).collect(Collectors.toList()); }