From 903a2401b271213f2a530e3afb33ff00e34d0ae9 Mon Sep 17 00:00:00 2001 From: yanglin Date: Tue, 14 Jan 2025 11:43:51 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3502:=20=E8=BF=87=E6=BB=A4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/workflow/WorkflowTodoCardButtonInterceptor.java | 5 ++--- .../workflow/WorkflowTodoCardButtonInterceptorFactory.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/workflow/WorkflowTodoCardButtonInterceptor.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/workflow/WorkflowTodoCardButtonInterceptor.java index 30e8cc77..45392c41 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/workflow/WorkflowTodoCardButtonInterceptor.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/workflow/WorkflowTodoCardButtonInterceptor.java @@ -18,7 +18,6 @@ import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.function.Supplier; import static java.util.stream.Collectors.toSet; @@ -29,8 +28,8 @@ import static java.util.stream.Collectors.toSet; @RequiredArgsConstructor class WorkflowTodoCardButtonInterceptor implements CardButtonInterceptor { + private final WorkflowTodoCardButtonInterceptorFactory factory; private final Todo todo; - private final Supplier workflowButtonsProvider; private BpmnTaskButtonVo workflowButtons; @Override @@ -119,7 +118,7 @@ class WorkflowTodoCardButtonInterceptor implements CardButtonInterceptor { private void fetchWorkflowButtons() { if (workflowButtons == null) - workflowButtons = workflowButtonsProvider.get(); + workflowButtons = factory.fetchWorkflowButtons(todo); } } \ No newline at end of file diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/workflow/WorkflowTodoCardButtonInterceptorFactory.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/workflow/WorkflowTodoCardButtonInterceptorFactory.java index 0c9e6376..9712550a 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/workflow/WorkflowTodoCardButtonInterceptorFactory.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/workflow/WorkflowTodoCardButtonInterceptorFactory.java @@ -40,10 +40,10 @@ class WorkflowTodoCardButtonInterceptorFactory implements CardButtonInterceptorF log.warn("todo not found. identityCode={}", card.getBizParam()); return null; } - return new WorkflowTodoCardButtonInterceptor(todo, () -> fetchWorkflowButtons(todo)); + return new WorkflowTodoCardButtonInterceptor(this, todo); } - private BpmnTaskButtonVo fetchWorkflowButtons(Todo todo) { + BpmnTaskButtonVo fetchWorkflowButtons(Todo todo) { TodoBusiness business = todoBusinessDao.getBusinesses(todo).findBusiness(todo).orElse(null); BizAssertions.assertNotNull(business, "todo business not found. todoIdentityCode={}", todo.getIdentityCode()); BpmnTaskButtonSearchDTO workflowRequest = new BpmnTaskButtonSearchDTO();