公司间调车流程优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -495,6 +495,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             Map<String, Object> appMap = new HashMap<>();
             appMap.put("sid", bv.getBusinessSid());
             variables.put("app", appMap);
+            variables.put("service", "公司间调车");
+            //调入采购部门sid
+            String callInBuyerOrgSid = baseInternalPurchase.getCallInBuyerOrgSid();
+            //调入部门信息
+            SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
+            //调入部门全路径
+            String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
+            variables.put("ydfOrgPath", orgSidPathDRBM);
             bv.setFormVariables(variables);
             bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
@@ -627,7 +635,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             }
             if (StringUtils.isBlank(nextNodeUserSids)) {
                 bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
-            }else {
+            } else {
                 String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
                 bv.setNextNodeUserSids(substring);
             }
@@ -654,6 +662,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
             //调入部门全路径
             String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
+            bv.setOrgSidPath(orgSidPathDRBM);
             userQuery.setRoleSid(candidateGroups.get(0));
             if (("Activity_08r04ow").equals(id)) {//判断下一环节是否为事业部副总经理审批(管辖调出方)
                 userQuery.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
@@ -674,7 +683,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             }
             if (StringUtils.isBlank(nextNodeUserSids)) {
                 bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
-            }else {
+            } else {
                 String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
                 bv.setNextNodeUserSids(substring);
             }
@@ -743,7 +752,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         }
         if (StringUtils.isBlank(nextNodeUserSids)) {
             bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
-        }else {
+        } else {
             String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
             bv.setNextNodeUserSids(substring);
         }

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

@@ -445,7 +445,21 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> {
         boolean contains = false;
         //设置是否是管理员自动审批，默认否
         boolean adminContains = false;
-        if (StringUtils.isBlank(nextUserSid)) {
+        String service = (String) formVariables.get("service");
+        String ydfOrgPath = (String) formVariables.get("ydfOrgPath");
+        if ("公司间调车".equals(service) && "Activity_0695qh4".equals(bv.getTaskDefKey())){
+            if (StringUtils.isBlank(nextUserSid)) {
+                bv.setOrgSidPath(ydfOrgPath);
+                ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
+                if (!stringResultBean.getSuccess()) {
+                    //下一环节用户为空的情况
+                    nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId();
+                    adminContains = true;
+                } else {
+                    nextUserSid = stringResultBean.getData();
+                }
+            }
+        } else if (StringUtils.isBlank(nextUserSid)) {
             ResultBean<String> stringResultBean = getNextNodeUserSidsOfSubmit(bv);
             if (!stringResultBean.getSuccess()) {
                 //下一环节用户为空的情况