BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 12e8eaba550535fb9e8ac83ba3c8a35d6a2f5afa

Authored by YunaiV
1 parent e2840d1c

fix(bpm): 修复流程实例抄送功能中的用户映射逻辑

Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceCopyController.java
  View file @12e8eab
@@ -65,16 +65,17 @@ public class BpmProcessInstanceCopyController { @@ -65,16 +65,17 @@ 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(), Long.parseLong(copy.getCreator())))); 70 + copy -> Stream.of(copy.getStartUserId(), copy.getUserId())));
70 Map<String, BpmProcessDefinitionInfoDO> processDefinitionInfoMap = processDefinitionService.getProcessDefinitionInfoMap( 71 Map<String, BpmProcessDefinitionInfoDO> processDefinitionInfoMap = processDefinitionService.getProcessDefinitionInfoMap(
71 convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getProcessDefinitionId)); 72 convertSet(pageResult.getList(), BpmProcessInstanceCopyDO::getProcessDefinitionId));
72 return success(convertPage(pageResult, copy -> { 73 return success(convertPage(pageResult, copy -> {
73 BpmProcessInstanceCopyRespVO copyVO = BeanUtils.toBean(copy, BpmProcessInstanceCopyRespVO.class); 74 BpmProcessInstanceCopyRespVO copyVO = BeanUtils.toBean(copy, BpmProcessInstanceCopyRespVO.class);
74 - MapUtils.findAndThen(userMap, Long.valueOf(copy.getCreator()),  
75 - user -> copyVO.setStartUser(BeanUtils.toBean(user, UserSimpleBaseVO.class)));  
76 - MapUtils.findAndThen(userMap, copy.getStartUserId(), 75 + MapUtils.findAndThen(userMap, copy.getUserId(),
77 user -> copyVO.setCreateUser(BeanUtils.toBean(user, UserSimpleBaseVO.class))); 76 user -> copyVO.setCreateUser(BeanUtils.toBean(user, UserSimpleBaseVO.class)));
  77 + MapUtils.findAndThen(userMap, copy.getStartUserId(),
  78 + user -> copyVO.setStartUser(BeanUtils.toBean(user, UserSimpleBaseVO.class)));
78 MapUtils.findAndThen(processInstanceMap, copyVO.getProcessInstanceId(), 79 MapUtils.findAndThen(processInstanceMap, copyVO.getProcessInstanceId(),
79 processInstance -> { 80 processInstance -> {
80 copyVO.setSummary(FlowableUtils.getSummary( 81 copyVO.setSummary(FlowableUtils.getSummary(
@@ -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 }