问题修改

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

@@ -437,6 +437,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
         Map<String, Object> formVariables = bv.getFormVariables();
         if (formVariables != null) {
             if (baseInternalPurchase.getShuntingTypeValue().equals("调入")) {
@@ -583,6 +584,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     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();
@@ -680,6 +682,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     public ResultBean companyToDivisionOperate(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -560,6 +560,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rrb = ResultBean.fireFail();
         BaseOutsourcingApplication booad = fetchBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(booad.getOrgSidPath());
         String businessTaskid = booad.getTaskId();
         Boolean isAdj = false;
         if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml

@@ -32,6 +32,6 @@
                      LEFT JOIN scm_collection_rebate scr
                 ON scr.`sid` = scrw.`collectionRebateSid`
         WHERE scrw.`mainSid` = #{sid}
-        GROUP BY scr.`collectionTypeKey`
+        GROUP BY scr.`collectionTypeKey` and scr.calculationStandard
     </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -355,6 +355,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             return rb.setMsg("该申请中包含车辆状态已是采购退库状态的车辆");
         }
         ScmVehicleReturnDto booad = baseMapper.getBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(booad.getOrgSidPath());
         String money = booad.getMoney();
         if (Double.parseDouble(money) > 0) {
             bv.getFormVariables().put("isLoan", true);
@@ -439,6 +440,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
     public ResultBean companyToDivisionOperate(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         ScmVehicleReturn scmVehicleReturn = fetchBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(scmVehicleReturn.getOrgSidPath());
         BigDecimal money = scmVehicleReturn.getMoney();
         bv.getFormVariables().put("isLoan", money.compareTo(new BigDecimal("0")) > 0);
         // ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);