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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
konbai
2022-10-08 22:02:58 +08:00
parent 431f3bcc44 c9b3a7563d
commit 4ab600987b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,8 +256,10 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
} else { } else {
List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery() List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list(); .processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
if (CollUtil.isNotEmpty(historicTaskInstance)) {
taskVo.setTaskId(historicTaskInstance.get(0).getId()); taskVo.setTaskId(historicTaskInstance.get(0).getId());
} }
}
taskVoList.add(taskVo); taskVoList.add(taskVo);
} }
page.setRecords(taskVoList); page.setRecords(taskVoList);