Commit 2e4f8fb3 authored by suhuiguang's avatar suhuiguang

1.流程串问题

parent 6662d296
...@@ -1630,14 +1630,14 @@ public class CommonServiceImpl implements ICommonService { ...@@ -1630,14 +1630,14 @@ public class CommonServiceImpl implements ICommonService {
workflowResultDto.setExecutorName(item.getExecutor().getRealName()); workflowResultDto.setExecutorName(item.getExecutor().getRealName());
} }
if (!CollectionUtils.isEmpty(item.getNextTask())) { if (!CollectionUtils.isEmpty(item.getNextTask())) {
ActTaskDTO actTaskDTO = item.getNextTask().get(0); ActTaskDTO actTaskDTO = item.getNextTask().get(item.getNextTask().size() - 1);
workflowResultDto.setNextTaskId(actTaskDTO.getId()); workflowResultDto.setNextTaskId(actTaskDTO.getId());
workflowResultDto.setNextTaskCode(actTaskDTO.getKey()); workflowResultDto.setNextTaskCode(actTaskDTO.getKey());
workflowResultDto.setNextTaskName(actTaskDTO.getName()); workflowResultDto.setNextTaskName(actTaskDTO.getName());
List<String> nextGroups = item.getNextCandidateGroups().get(actTaskDTO.getId()); List<String> nextGroups = item.getNextCandidateGroups().get(actTaskDTO.getId());
String join = String.join(",", nextGroups); String join = String.join(",", nextGroups);
workflowResultDto.setNextExecutorRoleIds(join); workflowResultDto.setNextExecutorRoleIds(join);
List<String> nextUserIds = item.getNextTaskExecutor().get(actTaskDTO.getId()).stream().map(AgencyUserModel::getUserId).collect(Collectors.toList()); List<String> nextUserIds = item.getNextTaskExecutor().get(actTaskDTO.getId()).stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
String nextUserIdsString = String.join(",", nextUserIds); String nextUserIdsString = String.join(",", nextUserIds);
workflowResultDto.setNextExecutorUserIds(nextUserIdsString); workflowResultDto.setNextExecutorUserIds(nextUserIdsString);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment