|
@@ -685,15 +685,9 @@ public class FlowApiServiceImpl implements FlowApiService {
|
|
flowTaskVo.setProcessDefinitionVersion(processDefinition.getVersion());
|
|
flowTaskVo.setProcessDefinitionVersion(processDefinition.getVersion());
|
|
ProcessInstance processInstance = instanceMap.get(task.getProcessInstanceId());
|
|
ProcessInstance processInstance = instanceMap.get(task.getProcessInstanceId());
|
|
flowTaskVo.setProcessInstanceId(processInstance.getId());
|
|
flowTaskVo.setProcessInstanceId(processInstance.getId());
|
|
- ////此处查询创建用户过于耗时,取消此处查询
|
|
|
|
- //Date changeBee = new Date();
|
|
|
|
- //System.err.println("查询创建用户前+++++:" + changeBee.getTime());
|
|
|
|
- //Object initiator = this.getProcessInstanceVariable(
|
|
|
|
- // processInstance.getId(), FlowConstant.PROC_INSTANCE_INITIATOR_VAR);
|
|
|
|
- //Date changeAff = new Date();
|
|
|
|
- //System.err.println("查询创建用户后+++++:" + changeAff.getTime());
|
|
|
|
- //System.err.println("查询创建用户耗时+++++:" + (changeAff.getTime() - changeBee.getTime()));
|
|
|
|
- //flowTaskVo.setProcessInstanceInitiator(initiator.toString());
|
|
|
|
|
|
+ Object initiator = this.getProcessInstanceVariable(
|
|
|
|
+ processInstance.getId(), FlowConstant.PROC_INSTANCE_INITIATOR_VAR);
|
|
|
|
+ flowTaskVo.setProcessInstanceInitiator(initiator.toString());
|
|
flowTaskVo.setProcessInstanceStartTime(processInstance.getStartTime());
|
|
flowTaskVo.setProcessInstanceStartTime(processInstance.getStartTime());
|
|
flowTaskVo.setBusinessKey(processInstance.getBusinessKey());
|
|
flowTaskVo.setBusinessKey(processInstance.getBusinessKey());
|
|
FlowWorkOrder flowWorkOrder = workOrderMap.get(task.getProcessInstanceId());
|
|
FlowWorkOrder flowWorkOrder = workOrderMap.get(task.getProcessInstanceId());
|
|
@@ -703,13 +697,13 @@ public class FlowApiServiceImpl implements FlowApiService {
|
|
|
|
|
|
flowTaskVoList.add(flowTaskVo);
|
|
flowTaskVoList.add(flowTaskVo);
|
|
}
|
|
}
|
|
- //Set<String> loginNameSet = flowTaskVoList.stream()
|
|
|
|
- // .map(FlowTaskVo::getProcessInstanceInitiator).collect(Collectors.toSet());
|
|
|
|
- //Map<String, String> userInfoMap = flowCustomExtFactory
|
|
|
|
- // .getFlowIdentityExtHelper().mapUserShowNameByLoginName(loginNameSet);
|
|
|
|
- //for (FlowTaskVo flowTaskVo : flowTaskVoList) {
|
|
|
|
- // flowTaskVo.setShowName(userInfoMap.get(flowTaskVo.getProcessInstanceInitiator()));
|
|
|
|
- //}
|
|
|
|
|
|
+ Set<String> loginNameSet = flowTaskVoList.stream()
|
|
|
|
+ .map(FlowTaskVo::getProcessInstanceInitiator).collect(Collectors.toSet());
|
|
|
|
+ Map<String, String> userInfoMap = flowCustomExtFactory
|
|
|
|
+ .getFlowIdentityExtHelper().mapUserShowNameByLoginName(loginNameSet);
|
|
|
|
+ for (FlowTaskVo flowTaskVo : flowTaskVoList) {
|
|
|
|
+ flowTaskVo.setShowName(userInfoMap.get(flowTaskVo.getProcessInstanceInitiator()));
|
|
|
|
+ }
|
|
return flowTaskVoList;
|
|
return flowTaskVoList;
|
|
}
|
|
}
|
|
|
|
|