From 2515ab3d14fb888b5b0a4054897d1cb933343a14 Mon Sep 17 00:00:00 2001
From: asp_ly <dengqichen@iscmtech.com>
Date: Tue, 17 Dec 2024 21:02:03 +0800
Subject: [PATCH] 1

---
 .../backend/workflow/api/WorkflowInstanceApiController.java   | 2 +-
 .../qqchen/deploy/backend/workflow/config/FlowableConfig.java | 3 ++-
 .../workflow/service/impl/WorkflowInstanceServiceImpl.java    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowInstanceApiController.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowInstanceApiController.java
index fcc396e4..1e92c87a 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowInstanceApiController.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowInstanceApiController.java
@@ -68,7 +68,7 @@ public class WorkflowInstanceApiController extends BaseController<WorkflowInstan
 
     @Operation(summary = "分页查询历史实例")
     @GetMapping("/historical-instances")
-    public Response<Page<WorkflowHistoricalInstancesDTO>> historicalInstances(@RequestBody WorkflowHistoricalInstancesQuery query) {
+    public Response<Page<WorkflowHistoricalInstancesDTO>> historicalInstances(WorkflowHistoricalInstancesQuery query) {
         return Response.success(workflowInstanceService.historicalInstances(query));
     }
 
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/config/FlowableConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/config/FlowableConfig.java
index 6503350e..c3bfbd74 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/config/FlowableConfig.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/config/FlowableConfig.java
@@ -7,6 +7,7 @@ import org.flowable.spring.boot.EngineConfigurationConfigurer;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 /**
  * Flowable配置类
@@ -45,6 +46,6 @@ public class FlowableConfig implements EngineConfigurationConfigurer<SpringProce
 //        engineConfiguration.setEnableProcessDefinitionInfoCache(false);
 
         // 添加事件监听器
-        engineConfiguration.setEventListeners(Arrays.asList(flowableEventDispatcher));
+        engineConfiguration.setEventListeners(Collections.singletonList(flowableEventDispatcher));
     }
 }
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowInstanceServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowInstanceServiceImpl.java
index 682660c4..331c0658 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowInstanceServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowInstanceServiceImpl.java
@@ -220,7 +220,7 @@ public class WorkflowInstanceServiceImpl extends BaseServiceImpl<WorkflowInstanc
             Process process = bpmnModel.getMainProcess();
             //排序
             List<FlowElement> flowElements = FlowableUtils.sortFlowElements(process);
-            List<WorkflowNodeInstance> nodeInstances = workflowNodeInstanceRepository.findByWorkflowInstanceId(41L);
+            List<WorkflowNodeInstance> nodeInstances = workflowNodeInstanceRepository.findByWorkflowInstanceId(workflowInstance.getId());
             Map<String, WorkflowNodeInstance> nodeWorkflowNodeInstance = nodeInstances.stream().collect(Collectors.toMap(WorkflowNodeInstance::getNodeId, nodeInstance -> nodeInstance));
             List<WorkflowNodeInstance> nodeResult = new ArrayList<>();
             flowElements.forEach(v -> {
@@ -229,7 +229,7 @@ public class WorkflowInstanceServiceImpl extends BaseServiceImpl<WorkflowInstanc
                     WorkflowNodeInstance empty = new WorkflowNodeInstance();
                     empty.setStatus(WorkflowNodeInstanceStatusEnums.NOT_STARTED);
                     empty.setNodeId(v.getId());
-                    empty.setNodeId(v.getName());
+                    empty.setNodeName(v.getName());
                     nodeResult.add(empty);
                 } else {
                     nodeResult.add(workflowNodeInstance);