From 1829693e61a093f854a5a436e6c3b579b014a80a Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Thu, 18 Aug 2022 23:55:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=E7=BC=BA=E5=B0=91=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/workflow/service/impl/WfProcessServiceImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java index 81e1cca5..8563992c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java @@ -480,7 +480,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce Process process = repositoryService.getBpmnModel(historicProcIns.getProcessDefinitionId()).getMainProcess(); buildStartFormData(historicProcIns, process, deployId, procFormList); - buildUserTaskFormData(procInsId, deployId, taskIns.getTaskDefinitionKey(), process, procFormList); + buildUserTaskFormData(procInsId, deployId, process, procFormList); return procFormList; } @@ -507,7 +507,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce } } - private void buildUserTaskFormData(String procInsId, String deployId, String taskActivityId, Process process, List procFormList) { + private void buildUserTaskFormData(String procInsId, String deployId, Process process, List procFormList) { procFormList = procFormList == null ? new ArrayList<>() : procFormList; List activityInstanceList = historyService.createHistoricActivityInstanceQuery() .processInstanceId(procInsId).finished() @@ -515,10 +515,6 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce .orderByHistoricActivityInstanceStartTime().asc() .list(); for (HistoricActivityInstance instanceItem : activityInstanceList) { - // 跳过当前节点 - if (instanceItem.getActivityId().equals(taskActivityId)) { - continue; - } UserTask userTask = (UserTask) process.getFlowElement(instanceItem.getActivityId(), true); String formKey = userTask.getFormKey(); if (formKey == null) {