From 59e5063058be8001c9fcb27a9d94dc3acc5e3393 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 16 Apr 2024 16:42:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=BC=98=E5=8C=96=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=89=A9=E5=B1=95=E7=9B=91=E5=90=AC=E7=9A=84?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/context/TaskOperationContext.java  | 40 +++++++++++--------
 .../task/AutoOperatorEvent_101_Listener.java  |  4 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/TaskOperationContext.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/TaskOperationContext.java
index 515feaf35..57c4ecadc 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/TaskOperationContext.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/TaskOperationContext.java
@@ -1,10 +1,9 @@
 package cn.axzo.workflow.core.common.context;
 
 import cn.axzo.workflow.core.repository.entity.ExtAxHiTaskInst;
+import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.function.Supplier;
 
 /**
@@ -15,23 +14,32 @@ import java.util.function.Supplier;
  */
 public class TaskOperationContext extends CommonContext<TaskOperationContext> {
 
-    private Map<String, List<ExtAxHiTaskInst>> extTaskMap = new HashMap<>();
+    private List<ExtAxHiTaskInst> extAxHiTaskInsts;
 
-    private Map<String, List<ExtAxHiTaskInst>> getExtTaskMap() {
-        return extTaskMap;
-    }
-
-    private void setExtTaskMap(String key, List<ExtAxHiTaskInst> taskInstList) {
-        extTaskMap.put(key, taskInstList);
-    }
-
-    public List<ExtAxHiTaskInst> getExtTaskInstList(String key, Supplier<List<ExtAxHiTaskInst>> supplier) {
-        if (getExtTaskMap().containsKey(key)) {
-            return getExtTaskMap().get(key);
+    public List<ExtAxHiTaskInst> getExtAxHiTaskInsts(Supplier<List<ExtAxHiTaskInst>> supplier) {
+        if (CollectionUtils.isEmpty(extAxHiTaskInsts)) {
+            extAxHiTaskInsts.addAll(supplier.get());
         }
-        setExtTaskMap(key, supplier.get());
-        return getExtTaskInstList(key, supplier);
+        return extAxHiTaskInsts;
     }
 
+    //    private Map<String, List<ExtAxHiTaskInst>> extTaskMap = new HashMap<>();
+//
+//    private Map<String, List<ExtAxHiTaskInst>> getExtTaskMap() {
+//        return extTaskMap;
+//    }
+//
+//    private void setExtTaskMap(String key, List<ExtAxHiTaskInst> taskInstList) {
+//        extTaskMap.put(key, taskInstList);
+//    }
+//
+//    public List<ExtAxHiTaskInst> getExtTaskInstList(String key, Supplier<List<ExtAxHiTaskInst>> supplier) {
+//        if (getExtTaskMap().containsKey(key)) {
+//            return getExtTaskMap().get(key);
+//        }
+//        setExtTaskMap(key, supplier.get());
+//        return getExtTaskInstList(key, supplier);
+//    }
+
 
 }
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
index 7807df6a1..e2e78e808 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_101_Listener.java
@@ -150,9 +150,7 @@ public class AutoOperatorEvent_101_Listener extends AbstractBpmnEventListener<Ta
                                 ExtHiTaskSearchDTO searchDTO = new ExtHiTaskSearchDTO();
                                 searchDTO.setProcessInstanceId(delegateTask.getProcessInstanceId());
                                 searchDTO.setTaskDefinitionKey(i.getActivityId());
-                                getContext().getExtTaskInstList(buildCacheKey("extAxHiTaskInstService.queryList", searchDTO),
-                                                () -> extAxHiTaskInstService.queryList(searchDTO))
-//                                extAxHiTaskInstService.queryList(searchDTO)
+                                getContext().getExtAxHiTaskInsts(() -> extAxHiTaskInstService.queryList(searchDTO))
                                         .stream().filter(e -> Objects.equals(e.getStatus(), APPROVED.getStatus()))
                                         .map(ExtAxHiTaskInst::getAssignee)
                                         .filter(Objects::nonNull)