DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(流程详情): 修复流程详情表单信息缺少当前节点表单信息bug

Browse Source
This commit is contained in:
konbai
2022-08-18 23:55:42 +08:00
parent 929035442f
commit 1829693e61
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java
View File

@@ -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<FormConf> procFormList) {
private void buildUserTaskFormData(String procInsId, String deployId, Process process, List<FormConf> procFormList) {
procFormList = procFormList == null ? new ArrayList<>() : procFormList;
List<HistoricActivityInstance> 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) {