|
|
@@ -369,7 +369,7 @@ public class TodoCenterManage { |
|
|
|
//通过审核后 所处理的逻辑 |
|
|
|
handlerManage.afterPassTodo(declaredProject,instance); |
|
|
|
|
|
|
|
return findNextTaskId(instance,employeeCode,nodeId); |
|
|
|
return findNextTaskId(instance,employeeCode,nodeId,param.getTaskId()); |
|
|
|
// 驳回 |
|
|
|
case REJECT: |
|
|
|
//前置判断前端传的taskId是否存在不存在的情况 有可能是 或签被别人审批掉了 |
|
|
@@ -425,7 +425,7 @@ public class TodoCenterManage { |
|
|
|
//上个审批人处理逻辑 |
|
|
|
processTaskService.lastWithdrawTask(param); |
|
|
|
|
|
|
|
return findNextTaskId(instance,employeeCode,nodeId); |
|
|
|
return findNextTaskId(instance,employeeCode,nodeId,param.getTaskId()); |
|
|
|
} |
|
|
|
break; |
|
|
|
default: |
|
|
@@ -1252,7 +1252,7 @@ public class TodoCenterManage { |
|
|
|
* @param instance |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private String findNextTaskId(HistoricProcessInstance instance,String employeeCode,String nodeId) { |
|
|
|
private String findNextTaskId(HistoricProcessInstance instance,String employeeCode,String nodeId,String taskId) { |
|
|
|
BpmnModel bpmnModel = repositoryService.getBpmnModel(instance.getProcessDefinitionId()); |
|
|
|
Map<String, String> subNodeMap = ProcessTaskUtils.getSubNodeMap(bpmnModel); |
|
|
|
String subProcessId = subNodeMap.get(nodeId); |
|
|
@@ -1267,7 +1267,7 @@ public class TodoCenterManage { |
|
|
|
.asc() |
|
|
|
.list(); |
|
|
|
if(CollUtil.isEmpty(tasks)){ |
|
|
|
return "处理成功"; |
|
|
|
return taskId; |
|
|
|
} |
|
|
|
return tasks.get(0).getId(); |
|
|
|
} |
|
|
|