diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java index 526f991a..3967c819 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java @@ -643,6 +643,7 @@ public class ActTaskService extends BaseServiceImpl { taskService.addComment(task.getId(), task.getProcessInstanceId(), comment); taskService.setVariable(task.getId(), Task_HANDLE_STATE, Task_HANDLE_STATE_STOP); taskService.setVariable(task.getId(), "reject", Boolean.TRUE); // 存在被拒绝的批示 + taskService.setVariable(task.getId(), "backToFirst", Boolean.FALSE); // 驳回 taskService.complete(taskId); pointActivity.getIncomingTransitions().remove(newTransition); List pvmTransitionListC = currActivity.getOutgoingTransitions(); @@ -700,6 +701,7 @@ public class ActTaskService extends BaseServiceImpl { taskService.setVariable(task.getId(), Task_HANDLE_STATE, Task_HANDLE_STATE_STOP); taskService.setVariable(task.getId(), "endByUser", Boolean.TRUE); // 主动终止流程 taskService.setVariable(task.getId(), "reject", Boolean.TRUE); // 存在被拒绝的批示 + taskService.setVariable(task.getId(), "backToFirst", Boolean.FALSE); // 驳回 taskService.complete(task.getId()); pointActivity.getIncomingTransitions().remove(newTransition); List pvmTransitionListC = currActivity.getOutgoingTransitions();