lazymangod
diff --git a/‎hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/flowable/utils/JumpTaskCmd.java
Lines changed: 7 additions & 2 deletions b/‎hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/flowable/utils/JumpTaskCmd.java
Lines changed: 7 additions & 2 deletions
diff --git a/‎hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/BpmTaskService.java
Lines changed: 3 additions & 15 deletions b/‎hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/BpmTaskService.java
Lines changed: 3 additions & 15 deletions
diff --git a/‎hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/BpmProcessServiceImpl.java
Lines changed: 11 additions & 24 deletions b/‎hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/BpmProcessServiceImpl.java
Lines changed: 11 additions & 24 deletions
@@ -1,5 +1,6 @@
 package org.hswebframework.web.workflow.flowable.utils;
 
+import org.activiti.engine.history.HistoricActivityInstance;
 import org.activiti.engine.impl.context.Context;
 import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
@@ -9,6 +10,8 @@
 import org.activiti.engine.impl.pvm.process.ProcessDefinitionImpl;
 import org.activiti.engine.task.Comment;
 
+import java.util.List;
+
 /**
  * Created by Administrator on 2016/4/20 0020.
  */
@@ -24,13 +27,15 @@ public JumpTaskCmd(String executionId, String activityId) {
 
     @Override
     public Comment execute(CommandContext commandContext) {
-        for (TaskEntity taskEntity : Context.getCommandContext().getTaskEntityManager().findTasksByExecutionId(executionId)) {
-            Context.getCommandContext().getTaskEntityManager().deleteTask(taskEntity, "jump", false);
+
+        for (TaskEntity taskEntity : commandContext.getTaskEntityManager().findTasksByExecutionId(executionId)) {
+            commandContext.getTaskEntityManager().deleteTask(taskEntity, "jump", false);
         }
         ExecutionEntity executionEntity = Context.getCommandContext().getExecutionEntityManager().findExecutionById(executionId);
         ProcessDefinitionImpl processDefinition = executionEntity.getProcessDefinition();
         ActivityImpl activity = processDefinition.findActivity(activityId);
         executionEntity.executeActivity(activity);
+
         return null;
     }
 }
@@ -4,6 +4,7 @@
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.task.Task;
 import org.hswebframework.web.workflow.service.request.CompleteTaskRequest;
+import org.hswebframework.web.workflow.service.request.JumpTaskRequest;
 import org.hswebframework.web.workflow.service.request.RejectTaskRequest;
 
 import java.util.Collection;
@@ -78,27 +79,14 @@ public interface BpmTaskService {
 
     /**
      * 流程任意跳转
-     *
-     * @param procInstId 流程实例ID
-     * @param activity   流程环节ID
      */
-    Task jumpTask(String procInstId, String activity);
+    void jumpTask(JumpTaskRequest request);
 
     /**
-     * 驳回
-     *
-     * @param request
+     * 驳回任务
      */
     void reject(RejectTaskRequest request);
 
-    /**
-     * 设置办理人
-     *
-     * @param taskId 当前环节ID
-     * @param userId 用户ID
-     */
-    void setAssignee(String taskId, String userId);
-
     /**
      * 结束流程
      *
 
@@ -86,31 +86,18 @@ public ProcessInstance startProcessInstance(StartProcessRequest request) {
 
             List<Task> tasks = bpmTaskService.selectTaskByProcessId(processInstance.getProcessDefinitionId());
 
-            //指定了下一环节
-            if (!StringUtils.isNullOrEmpty(request.getNextActivityId())) {
-                //跳转
-                Task afterJump = bpmTaskService.jumpTask(processInstance.getProcessDefinitionId(), request.getNextActivityId());
-
-                //设置候选人
-                candidateUserSetter.accept(afterJump);
-
-                tasks.stream()
-                        .map(Task::getId)
-                        .forEach(bpmTaskService::removeHiTask);
+            //当前节点
+            String activityId = processInstance.getActivityId();
+            if (activityId == null) {
+                //所有task设置候选人
+                tasks.forEach(candidateUserSetter);
             } else {
-                //当前节点
-                String activityId = processInstance.getActivityId();
-                if (activityId == null) {
-                    //所有task设置候选人
-                    tasks.forEach(candidateUserSetter);
-                } else {
-                    candidateUserSetter.accept(taskService
-                            .createTaskQuery()
-                            .processInstanceId(processInstance.getProcessInstanceId())
-                            .taskDefinitionKey(activityId)
-                            .active()
-                            .singleResult());
-                }
+                candidateUserSetter.accept(taskService
+                        .createTaskQuery()
+                        .processInstanceId(processInstance.getProcessInstanceId())
+                        .taskDefinitionKey(activityId)
+                        .active()
+                        .singleResult());
             }
 
             workFlowFormService.saveProcessForm(processInstance, SaveFormRequest