Merge remote-tracking branch 'origin/master'

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java

@@ -447,7 +447,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         boolean adminContains = false;
         String service = (String) formVariables.get("service");
         String ydfOrgPath = (String) formVariables.get("ydfOrgPath");
-        if ("公司间调车".equals(service) && "Activity_0695qh4".equals(bv.getTaskDefKey())){
+        if ("公司间调车".equals(service) && "Activity_0695qh4".equals(bv.getTaskDefKey())) {
             if (StringUtils.isBlank(nextUserSid)) {
                 bv.setOrgSidPath(ydfOrgPath);
                 ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
@@ -528,6 +528,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
             bv.setNextNodeUserSids("");
             return handleProsess(bv, false);
         }
+        if (!DelegationState.PENDING.equals(task.getDelegationState())) {
             //获取该流程所有要走的环节节点
             List<FlowElement> flowElements = calApprovePath(bv.getModelId(),
                     bv.getFormVariables());
@@ -581,6 +582,8 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
                     break;
                 }
             }
+        }
+
         if (contains) {
             bv.setUserSid(nextUserSid);
             bv.setTaskId(vo.getTaskId());