调车流程问题修改

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

@@ -581,10 +581,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         }
     }
 
-    public ResultBean InitiatorToAnswer(BusinessVariables bv,String id) {
+    public ResultBean InitiatorToAnswer(BusinessVariables bv, String id) {
         ResultBean rb = ResultBean.fireFail();
         BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
-        bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
         String shuntingTypeValue = baseInternalPurchase.getShuntingTypeValue();
         if (shuntingTypeValue.equals("调入")) {
             String callOutOrgSid = baseInternalPurchase.getSellerOrgSid();
@@ -616,20 +615,23 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
             List<String> candidateGroups = voList.get(0).getCandidateGroups();
             UserRoleQuery userRoleQuery = new UserRoleQuery();
-            if (StringUtils.isNotBlank(id)){
+            if (StringUtils.isNotBlank(id)) {
-                if (id.equals("Activity_08r04ow")){
+                if (id.equals("Activity_08r04ow")) {//事业部副总经理审批(管辖调出方)
                     String sellerOrgSid = baseInternalPurchase.getSellerOrgSid();
                     userRoleQuery.setRoleSid(candidateGroups.get(0));
                     userRoleQuery.setOrgSid(sellerOrgSid);
-                }else if (id.equals("Activity_02xqz9n")){
+                    SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInOrgSid).getData();
+                    String orgSidPath = data.getOrgSidPath();
+                    bv.setOrgSidPath(orgSidPath);
+                } else if (id.equals("Activity_02xqz9n")) {//事业部副总经理审批(管辖调入方)
                     String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid();
                     userRoleQuery.setRoleSid(candidateGroups.get(0));
                     userRoleQuery.setOrgSid(buyerOrgSid);
-                }else {
+                } else {
                     userRoleQuery.setRoleSid(candidateGroups.get(0));
                     userRoleQuery.setOrgSid(callInOrgSid);
                 }
-            }else {
+            } else {
                 userRoleQuery.setRoleSid(candidateGroups.get(0));
                 userRoleQuery.setOrgSid(callInOrgSid);
             }