fix processNodes NPE

xlorne · xlorne · commit 61d86aad4e99 · 2026-05-18T22:16:28.000+08:00
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/domain/DelayTaskManager.java b/flow-engine-framework/src/main/java/com/codingapi/flow/domain/DelayTaskManager.java
@@ -1,5 +1,6 @@
 package com.codingapi.flow.domain;
 
+import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.service.impl.FlowDelayTriggerService;
 import com.codingapi.flow.session.IRepositoryHolder;
 import lombok.Getter;
@@ -30,7 +31,7 @@ public void start(IRepositoryHolder repositoryHolder) {
         List<DelayTask> delayTasks = repositoryHolder.findDelayTasks();
         if (delayTasks != null && !delayTasks.isEmpty()) {
             for (DelayTask delayTask : delayTasks) {
-                this.addTask(delayTask,repositoryHolder);
+                this.addTask(delayTask, repositoryHolder);
             }
         }
         System.out.println("flow delay task started");
@@ -52,9 +53,9 @@ public void close() {
     /**
      * 添加任务队列
      */
-    public void addTask(DelayTask task,IRepositoryHolder repositoryHolder) {
+    public void addTask(DelayTask task, IRepositoryHolder repositoryHolder) {
         repositoryHolder.saveDelayTask(task);
-        this.delayJobs.add(new DelayJob(task,repositoryHolder));
+        this.delayJobs.add(new DelayJob(task, repositoryHolder));
     }
 
     /**
@@ -64,7 +65,7 @@ private static class DelayJob {
         private final DelayTask task;
         private final Timer timer;
 
-        public DelayJob(DelayTask task,IRepositoryHolder repositoryHolder) {
+        public DelayJob(DelayTask task, IRepositoryHolder repositoryHolder) {
             this.task = task;
             this.timer = new Timer();
             this.start(repositoryHolder);
@@ -78,11 +79,9 @@ private void start(IRepositoryHolder repositoryHolder) {
             this.timer.schedule(new TimerTask() {
                 @Override
                 public void run() {
-
+                    FlowOperatorLocalThreadCache.getInstance().clear();
                     FlowDelayTriggerService flowDelayTriggerService = repositoryHolder.createDelayTriggerService(task);
-
                     flowDelayTriggerService.trigger();
-
                     repositoryHolder.deleteDelayTask(task);
                 }
             }, new Date(task.getTriggerTime()));
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/FlowService.java
@@ -1,5 +1,6 @@
 package com.codingapi.flow.service;
 
+import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.pojo.request.*;
 import com.codingapi.flow.pojo.response.ActionResponse;
 import com.codingapi.flow.pojo.response.FlowContent;
@@ -26,22 +27,26 @@ public FlowService(IRepositoryHolder repositoryHolder) {
 
     /**
      * 流程详情
+     *
      * @param request 流程详情请求
      * @return 流程详情
      */
     public FlowContent detail(FlowDetailRequest request) {
-        FlowDetailService flowDetailService = new FlowDetailService(request,this.repositoryHolder);
+        FlowOperatorLocalThreadCache.getInstance().clear();
+        FlowDetailService flowDetailService = new FlowDetailService(request, this.repositoryHolder);
         return flowDetailService.detail();
     }
 
 
     /**
      * 流程节点记录
+     *
      * @param request 流程节点记录请求
      * @return 流程节点记录列表
      */
     public List<ProcessNode> processNodes(FlowProcessNodeRequest request) {
-        FlowProcessNodeService flowProcessNodeService = new FlowProcessNodeService(request,this.repositoryHolder);
+        FlowOperatorLocalThreadCache.getInstance().clear();
+        FlowProcessNodeService flowProcessNodeService = new FlowProcessNodeService(request, this.repositoryHolder);
         return flowProcessNodeService.processNodes();
     }
 
@@ -52,7 +57,8 @@ public List<ProcessNode> processNodes(FlowProcessNodeRequest request) {
      * @return 创建的流程id
      */
     public long create(FlowCreateRequest request) {
-        FlowCreateService flowCreateService = new FlowCreateService(request,this.repositoryHolder);
+        FlowOperatorLocalThreadCache.getInstance().clear();
+        FlowCreateService flowCreateService = new FlowCreateService(request, this.repositoryHolder);
         return flowCreateService.create();
     }
 
@@ -62,7 +68,8 @@ public long create(FlowCreateRequest request) {
      * @param request 审批请求
      */
     public ActionResponse action(FlowActionRequest request) {
-        FlowActionService flowActionService = new FlowActionService(request,this.repositoryHolder);
+        FlowOperatorLocalThreadCache.getInstance().clear();
+        FlowActionService flowActionService = new FlowActionService(request, this.repositoryHolder);
         return flowActionService.action();
     }
 
@@ -72,7 +79,8 @@ public ActionResponse action(FlowActionRequest request) {
      * @param request 撤销请求
      */
     public void revoke(FlowRevokeRequest request) {
-        FlowRevokeService flowRevokeService = new FlowRevokeService(request,this.repositoryHolder);
+        FlowOperatorLocalThreadCache.getInstance().clear();
+        FlowRevokeService flowRevokeService = new FlowRevokeService(request, this.repositoryHolder);
         flowRevokeService.revoke();
     }
 
@@ -81,7 +89,8 @@ public void revoke(FlowRevokeRequest request) {
      * 催办
      */
     public void urge(FlowUrgeRequest request) {
-        FlowUrgeService flowUrgeService = new FlowUrgeService(request,this.repositoryHolder);
+        FlowOperatorLocalThreadCache.getInstance().clear();
+        FlowUrgeService flowUrgeService = new FlowUrgeService(request, this.repositoryHolder);
         flowUrgeService.urge();
     }
 }
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowActionService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowActionService.java
@@ -1,7 +1,6 @@
 package com.codingapi.flow.service.impl;
 
 import com.codingapi.flow.action.IFlowAction;
-import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.context.ActionResponseContext;
 import com.codingapi.flow.exception.FlowNotFoundException;
 import com.codingapi.flow.exception.FlowStateException;
@@ -42,12 +41,9 @@ public FlowActionService(FlowActionRequest request,IRepositoryHolder repositoryH
     }
 
     public ActionResponse action() {
-
-        FlowOperatorLocalThreadCache.getInstance().clear();
         ActionResponseContext.getInstance().clear();
         request.verify();
 
-
         // 验证当前用户
         IFlowOperator currentOperator = flowOperatorGateway.get(request.getAdvice().getOperatorId());
         if (currentOperator == null) {
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowCreateService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowCreateService.java
@@ -1,7 +1,6 @@
 package com.codingapi.flow.service.impl;
 
 import com.codingapi.flow.action.IFlowAction;
-import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.event.FlowRecordStartEvent;
 import com.codingapi.flow.event.FlowRecordTodoEvent;
 import com.codingapi.flow.event.IFlowEvent;
@@ -43,7 +42,6 @@ public FlowCreateService(FlowCreateRequest request,IRepositoryHolder repositoryH
     }
 
     public long create() {
-        FlowOperatorLocalThreadCache.getInstance().clear();
         request.verify();
         Workflow workflow = workflowService.getWorkflow(request.getWorkId());
         if (workflow == null) {
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDelayTriggerService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDelayTriggerService.java
@@ -43,7 +43,6 @@ public FlowDelayTriggerService(DelayTask delayTask, IRepositoryHolder repository
      * 延期任务触发执行
      */
     public void trigger() {
-        FlowOperatorLocalThreadCache.getInstance().clear();
         FlowRecord flowRecord = flowRecordService.getFlowRecord(delayTask.getCurrentRecordId());
         if (flowRecord == null) {
             throw FlowNotFoundException.record(delayTask.getCurrentRecordId());
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDetailService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowDetailService.java
@@ -1,6 +1,5 @@
 package com.codingapi.flow.service.impl;
 
-import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.exception.FlowNotFoundException;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.operator.IFlowOperator;
@@ -35,7 +34,6 @@ public FlowDetailService(FlowDetailRequest request, IRepositoryHolder repository
     }
 
     public FlowContent detail() {
-        FlowOperatorLocalThreadCache.getInstance().clear();
         if (this.request.isCreateWorkflow()) {
             Workflow workflow = workflowService.getWorkflow(this.request.getId());
             if (workflow == null) {
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java
@@ -2,7 +2,6 @@
 
 import com.codingapi.flow.action.IFlowAction;
 import com.codingapi.flow.action.actions.PassAction;
-import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.exception.FlowNotFoundException;
 import com.codingapi.flow.form.FormData;
 import com.codingapi.flow.manager.ActionManager;
@@ -119,7 +118,6 @@ private void fetchFlowRecordOperatorList() {
     }
 
     public List<ProcessNode> processNodes() {
-        FlowOperatorLocalThreadCache.getInstance().clear();
         // load history data
         if (this.flowRecord != null) {
             this.loadHistoryData();
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowRevokeService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowRevokeService.java
@@ -1,6 +1,5 @@
 package com.codingapi.flow.service.impl;
 
-import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.event.FlowRecordTodoEvent;
 import com.codingapi.flow.event.IFlowEvent;
 import com.codingapi.flow.exception.FlowNotFoundException;
@@ -39,7 +38,6 @@ public FlowRevokeService(FlowRevokeRequest request,IRepositoryHolder repositoryH
     }
 
     public void revoke() {
-        FlowOperatorLocalThreadCache.getInstance().clear();
         request.verify();
         // 验证当前用户
         FlowRecord currentRecord = flowRecordService.getFlowRecord(request.getRecordId());
diff --git a/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowUrgeService.java b/flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowUrgeService.java
@@ -1,6 +1,5 @@
 package com.codingapi.flow.service.impl;
 
-import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.domain.UrgeInterval;
 import com.codingapi.flow.event.FlowRecordUrgeEvent;
 import com.codingapi.flow.event.IFlowEvent;
@@ -46,7 +45,6 @@ public FlowUrgeService(FlowUrgeRequest request,IRepositoryHolder repositoryHolde
      * 催办
      */
     public void urge() {
-        FlowOperatorLocalThreadCache.getInstance().clear();
         request.verify();
         // 验证当前用户
         FlowRecord currentRecord = flowRecordService.getFlowRecord(request.getRecordId());
