From 0774b7f25bdab87fa8e798ef23e526ba77294a4d Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sun, 10 Dec 2023 12:31:51 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ActProcessInstanceServiceImpl.java     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index 323cc5e91..b1dee83b8 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -31,10 +31,7 @@ import org.dromara.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd;
 import org.dromara.workflow.service.IActHiProcinstService;
 import org.dromara.workflow.service.IActProcessInstanceService;
 import org.dromara.workflow.utils.WorkflowUtils;
-import org.flowable.bpmn.model.BpmnModel;
-import org.flowable.bpmn.model.FlowElement;
-import org.flowable.bpmn.model.GraphicInfo;
-import org.flowable.bpmn.model.UserTask;
+import org.flowable.bpmn.model.*;
 import org.flowable.engine.*;
 import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.history.HistoricProcessInstance;
@@ -294,6 +291,18 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
                 graphicInfoVo.setNodeName(flowElement.getName());
                 graphicInfoVos.add(graphicInfoVo);
             }
+            if (flowElement instanceof SubProcess) {
+                Collection<FlowElement> subFlowElements = ((SubProcess) flowElement).getFlowElements();
+                for (FlowElement element : subFlowElements) {
+                    if (element instanceof UserTask) {
+                        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(element.getId());
+                        GraphicInfoVo graphicInfoVo = BeanUtil.toBean(graphicInfo, GraphicInfoVo.class);
+                        graphicInfoVo.setNodeId(element.getId());
+                        graphicInfoVo.setNodeName(element.getName());
+                        graphicInfoVos.add(graphicInfoVo);
+                    }
+                }
+            }
         }
         //节点图形信息
         map.put("graphicInfoVos", graphicInfoVos);