From bb1e67513cc446cbadbb0524a7cced7c57d80574 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Tue, 14 Jan 2025 14:25:00 +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

---
 .../workflow/WorkflowTodoCardButtonInterceptor.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 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 2fd1b698..38d2adef 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
@@ -114,6 +114,10 @@ class WorkflowTodoCardButtonInterceptor implements CardButtonInterceptor {
 
     private Set<String> getWorkflowHideButtonKeys() {
         fetchWorkflowButtons();
+        return getWorkflowHideButtonKeys(workflowButtons);
+    }
+
+    private Set<String> getWorkflowHideButtonKeys(BpmnTaskButtonVo workflowButtons) {
         List<BpmnButtonMetaInfo> workflowHiddenButtons = workflowButtons.getCustomHiddenButtons();
         if (workflowHiddenButtons == null)
             workflowHiddenButtons = Collections.emptyList();
@@ -123,6 +127,11 @@ class WorkflowTodoCardButtonInterceptor implements CardButtonInterceptor {
     }
 
     private Set<WorkflowButtonInfo> getWorkflowButtons() {
+        fetchWorkflowButtons();
+        return getWorkflowButtons(workflowButtons);
+    }
+
+    private Set<WorkflowButtonInfo> getWorkflowButtons(BpmnTaskButtonVo workflowButtons) {
         List<BpmnButtonMetaInfoWithVisibleScope> workflowHiddenButtons = workflowButtons.getButtons();
         if (workflowHiddenButtons == null)
             workflowHiddenButtons = Collections.emptyList();
@@ -136,8 +145,8 @@ class WorkflowTodoCardButtonInterceptor implements CardButtonInterceptor {
             workflowButtons = factory.fetchWorkflowButtons(todo);
 
             HashMap<String, Object> workflowButtonInfo = new HashMap<>();
-            workflowButtonInfo.put("workflowHideButtonKeys", getWorkflowHideButtonKeys());
-            workflowButtonInfo.put("workflowButtons", getWorkflowButtons());
+            workflowButtonInfo.put("workflowHideButtonKeys", getWorkflowHideButtonKeys(workflowButtons));
+            workflowButtonInfo.put("workflowButtons", getWorkflowButtons(workflowButtons));
             log.info("fetchWorkflowButtons, todoIdentityCode={}, workflowButtonInfo: {}",
                     todo.getIdentityCode(), JSON.toJSONString(workflowButtonInfo));
         }