|
|
@ -877,7 +877,17 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
List<UserTask> nextUserTask = FindNextNodeUtil.getNextUserTasks(repositoryService, task, new HashMap<>());
|
|
|
|
List<UserTask> nextUserTask = FindNextNodeUtil.getNextUserTasks(repositoryService, task, new HashMap<>());
|
|
|
|
if (CollectionUtils.isNotEmpty(nextUserTask)) {
|
|
|
|
if (CollectionUtils.isNotEmpty(nextUserTask)) {
|
|
|
|
for (UserTask userTask : nextUserTask) {
|
|
|
|
for (UserTask userTask : nextUserTask) {
|
|
|
|
MultiInstanceLoopCharacteristics characteristics = userTask.getLoopCharacteristics();
|
|
|
|
MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics();
|
|
|
|
|
|
|
|
// 会签节点
|
|
|
|
|
|
|
|
if (Objects.nonNull(multiInstance)) {
|
|
|
|
|
|
|
|
List<SysUser> list = sysUserService.selectUserList(new SysUser());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
flowNextDto.setVars(ProcessConstants.PROCESS_MULTI_INSTANCE_USER);
|
|
|
|
|
|
|
|
flowNextDto.setType(ProcessConstants.PROCESS_MULTI_INSTANCE);
|
|
|
|
|
|
|
|
flowNextDto.setUserList(list);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 读取自定义节点属性 判断是否是否需要动态指定任务接收人员、组
|
|
|
|
String dataType = userTask.getAttributeValue(ProcessConstants.NAMASPASE, ProcessConstants.PROCESS_CUSTOM_DATA_TYPE);
|
|
|
|
String dataType = userTask.getAttributeValue(ProcessConstants.NAMASPASE, ProcessConstants.PROCESS_CUSTOM_DATA_TYPE);
|
|
|
|
String userType = userTask.getAttributeValue(ProcessConstants.NAMASPASE, ProcessConstants.PROCESS_CUSTOM_USER_TYPE);
|
|
|
|
String userType = userTask.getAttributeValue(ProcessConstants.NAMASPASE, ProcessConstants.PROCESS_CUSTOM_USER_TYPE);
|
|
|
|
|
|
|
|
|
|
|
@ -901,12 +911,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
|
|
|
// 候选组
|
|
|
|
// 候选组
|
|
|
|
if (ProcessConstants.USER_TYPE_ROUPS.equals(userType)) {
|
|
|
|
if (ProcessConstants.USER_TYPE_ROUPS.equals(userType)) {
|
|
|
|
List<SysRole> sysRoles = sysRoleService.selectRoleAll();
|
|
|
|
List<SysRole> sysRoles = sysRoleService.selectRoleAll();
|
|
|
|
|
|
|
|
|
|
|
|
flowNextDto.setVars(ProcessConstants.PROCESS_APPROVAL);
|
|
|
|
flowNextDto.setVars(ProcessConstants.PROCESS_APPROVAL);
|
|
|
|
flowNextDto.setType(ProcessConstants.USER_TYPE_ROUPS);
|
|
|
|
flowNextDto.setType(ProcessConstants.USER_TYPE_ROUPS);
|
|
|
|
flowNextDto.setRoleList(sysRoles);
|
|
|
|
flowNextDto.setRoleList(sysRoles);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return AjaxResult.success("流程已完结", null);
|
|
|
|
return AjaxResult.success("流程已完结", null);
|
|
|
|
}
|
|
|
|
}
|
|
|
|