diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 42edfa7680..6daf28f4a7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/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 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 resultBean = flowFeign.handleProsess(bv); @@ -627,7 +635,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService { 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 stringResultBean = getNextNodeUserSidsOfSubmit(bv); + if (!stringResultBean.getSuccess()) { + //下一环节用户为空的情况 + nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); + adminContains = true; + } else { + nextUserSid = stringResultBean.getData(); + } + } + } else if (StringUtils.isBlank(nextUserSid)) { ResultBean stringResultBean = getNextNodeUserSidsOfSubmit(bv); if (!stringResultBean.getSuccess()) { //下一环节用户为空的情况