Commit b6be0775fd5ce0ee201b928c49a6d603d52e0a60
Merge branch 'feat/mes' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
Showing
1 changed file
with
1 additions
and
1 deletions
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java
| @@ -65,6 +65,7 @@ public class BpmProcessInstanceCopyController { | @@ -65,6 +65,7 @@ public class BpmProcessInstanceCopyController { | ||
| 65 | // 拼接返回 | 65 | // 拼接返回 |
| 66 | Map<String, HistoricProcessInstance> processInstanceMap = processInstanceService.getHistoricProcessInstanceMap( | 66 | Map<String, HistoricProcessInstance> processInstanceMap = processInstanceService.getHistoricProcessInstanceMap( |
| 67 | convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getProcessInstanceId)); | 67 | convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getProcessInstanceId)); |
| 68 | + | ||
| 68 | Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(pageResult.getList(), | 69 | Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertListByFlatMap(pageResult.getList(), |
| 69 | copy -> Stream.of(copy.getStartUserId(), copy.getUserId()))); | 70 | copy -> Stream.of(copy.getStartUserId(), copy.getUserId()))); |
| 70 | Map<String, BpmProcessDefinitionInfoDO> processDefinitionInfoMap = processDefinitionService.getProcessDefinitionInfoMap( | 71 | Map<String, BpmProcessDefinitionInfoDO> processDefinitionInfoMap = processDefinitionService.getProcessDefinitionInfoMap( |
| @@ -85,5 +86,4 @@ public class BpmProcessInstanceCopyController { | @@ -85,5 +86,4 @@ public class BpmProcessInstanceCopyController { | ||
| 85 | return copyVO; | 86 | return copyVO; |
| 86 | })); | 87 | })); |
| 87 | } | 88 | } |
| 88 | - | ||
| 89 | } | 89 | } |