移动端切换机构

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java

@@ -19,7 +19,6 @@ public class BaseInterNalPurchaseCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
@@ -38,4 +37,6 @@ public class BaseInterNalPurchaseCompleteDto implements Dto {
     private String businessSid;
     @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
     private Map<String, Object> formVariables;
+
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java

@@ -19,7 +19,6 @@ public class BaseModelModPriceCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-//    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
@@ -38,4 +37,6 @@ public class BaseModelModPriceCompleteDto implements Dto {
     private String businessSid;
     @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
     private Map<String, Object> formVariables;
+
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BusinessVariablesDto.java

@@ -55,4 +55,6 @@ public class BusinessVariablesDto {
      * 业务参数，按需传递
      */
     private Map<String, Object> formVariables;
+
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -399,6 +399,10 @@ public interface BaseVehicleFeign {
     @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}")
     public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("根据仓库sid 获取车架号")
+    @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}/{orgPath}")
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid, @PathVariable(value = "orgPath", required = false) String orgPath);
+
     /**
      * 存放地点变更选择车辆
      *

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -303,6 +303,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseActualSalesCompleteDto.java

@@ -20,7 +20,6 @@ public class BaseActualSalesCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
@@ -32,11 +31,10 @@ public class BaseActualSalesCompleteDto implements Dto {
     @NotBlank(message = "参数错误：instanceId")
     private String instanceId;
     @ApiModelProperty(value = "意见")
-//    @NotBlank(message = "参数错误：comment")
     private String comment;
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-//    @ApiModelProperty(value = "分支字段及业务字段")
-//    private Map<String, Object> formVariables;
+
+    private String orgPath;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/BusVehicleApplyCompleteDto.java

@@ -36,6 +36,6 @@ public class BusVehicleApplyCompleteDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-//    @ApiModelProperty(value = "分支字段及业务字段")
-//    private Map<String, Object> formVariables;
+
+    private String orgPath;
 }

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

@@ -433,6 +433,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
 
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(bv.getOrgPath())){
+            if(StringUtils.isBlank(bv.getOrgSidPath())){
+                return rb.setMsg("参数错误：orgSidPath");
+            }
+        }
         BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
         Map<String, Object> formVariables = bv.getFormVariables();
         if (formVariables != null) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -314,6 +314,11 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
 
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(bv.getOrgPath())){
+            if(StringUtils.isBlank(bv.getOrgSidPath())){
+                return rb.setMsg("参数错误：orgSidPath");
+            }
+        }
         BaseModelModprice baseModelModprice = fetchBySid(bv.getBusinessSid());
         List<BaseModelModpriceModelVo> baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(bv.getBusinessSid());
         if (bv.getTaskId().equals(baseModelModprice.getTaskId())) {

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

@@ -86,7 +86,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -518,6 +517,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
      * @return
      */
     public ResultBean complete(BusinessVariables bv) {
+        ResultBean rrb = ResultBean.fireFail();
+        if(StringUtils.isBlank(bv.getOrgPath())){
+            if(StringUtils.isBlank(bv.getOrgSidPath())){
+                return rrb.setMsg("参数错误：orgSidPath");
+            }
+        }
         BaseOutsourcingApplication booad = fetchBySid(bv.getBusinessSid());
         String businessTaskid = booad.getTaskId();
         if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -128,6 +128,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     private BaseManufacturerBankService baseManufacturerBankService;
     @Autowired
     private ScmWarehouseFeign scmWarehouseFeign;
+
     @Override
     public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
@@ -1058,7 +1059,12 @@ public class BaseVehicleRest implements BaseVehicleFeign {
 
     @Override
     public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
-        return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid);
+        return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid, "");
+    }
+
+    @Override
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) {
+        return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid, orgPath);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -2004,13 +2004,15 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success().setData(path);
     }
 
-    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
+    public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) {
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         List<String> carSidList = baseVehicleTempstateService.selectAll("001");
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
-        if (StringUtils.isNotBlank(resultBean.getData())) {
-            qw.eq("bv.createOrgSid", resultBean.getData());
+        if (StringUtils.isBlank(orgPath)) {
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
+        if (StringUtils.isNotBlank(orgPath)) {
+            qw.eq("bv.createOrgSid", orgPath);
         }
         if (carSidList.size() > 0) {
             qw.notIn("bv.sid", carSidList);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -435,6 +435,11 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(bv.getOrgPath())) {
+            if (StringUtils.isBlank(bv.getOrgSidPath())) {
+                return rb.setMsg("参数错误：orgSidPath");
+            }
+        }
         BaseVehicleActualSales baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
         if (bv.getTaskId().equals(baseVehicleActualSales.getTaskId())) {
             //判断车辆的结算状态是否包含预买断的状态，如果是的话，返回审核失败

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -467,6 +467,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(bv.getOrgPath())) {
+            if (StringUtils.isBlank(bv.getOrgSidPath())) {
+                return rb.setMsg("参数错误：orgSidPath");
+            }
+        }
         String businessSid = bv.getBusinessSid();
         BusVehicleApply busVehicleApply = fetchBySid(businessSid);
         Map<String, Object> variables = new HashMap<>();

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -48,7 +48,7 @@
         <if test="name != '' and name != null">
             AND cct.name LIKE concat('%', #{name}, '%')
         </if>
-        GROUP BY cct.id DESC
+        order BY cct.id DESC
     </select>
 
     <select id="selectBySid" resultType="com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo">

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.flowable.sqloperationsymbol;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -57,4 +58,6 @@ public class BusinessVariables {
      * 业务参数，按需传递
      */
     private Map<String, Object> formVariables =new HashMap<>();
+    @ApiModelProperty("机构sid:切换结构使用")
+    private String orgPath;
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -28,10 +28,8 @@ package com.yxt.anrui.flowable.biz.flow;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.yxt.anrui.flowable.api.flow.*;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
-import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService;
 import com.yxt.anrui.flowable.biz.process.ProcessService;
@@ -44,7 +42,6 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
-import org.flowable.bpmn.model.ExtensionAttribute;
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.UserTask;
 import org.flowable.engine.TaskService;
@@ -119,6 +116,7 @@ public class FlowableRest implements FlowableFeign {
     public ResultBean<String> getNextNodeUserSidsOfCreate(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         String orgSidPath=bv.getOrgSidPath();
+        String orgPath = bv.getOrgPath();
         //根据业务参数取流程流转的环节 信息
         List<Map<String, Object>> list = (List<Map<String, Object>>) flowtaskService.getProcessCirculationNodesByMap(bv).getData();
         if(list==null||list.size()<2){
@@ -129,16 +127,17 @@ public class FlowableRest implements FlowableFeign {
         if(o==null){
             return rb.setMsg("流程设计问题");
         }
-        return getNextUserSids(rb, orgSidPath, o);
+        return getNextUserSids(rb, orgSidPath, o,orgPath);
     }
 
-    private ResultBean getNextUserSids(ResultBean rb, String orgSidPath, Object o) {
+    private ResultBean getNextUserSids(ResultBean rb, String orgSidPath, Object o,String orgPath) {
         JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(o));
         String roleSid = jsonArray.get(0).toString();
         //根据组织架构、角色两个参数取相关符合条件的用户信息
         UserQuery userQuery = new UserQuery();
         userQuery.setRoleSid(roleSid);
         userQuery.setOrgSidPath(orgSidPath);
+        userQuery.setOrgPath(orgPath);
         List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
         if(sysUserVos==null||sysUserVos.size()<1){
             return rb.fail().setMsg("环节没有用户");
@@ -160,6 +159,7 @@ public class FlowableRest implements FlowableFeign {
         ResultBean rb = ResultBean.fireSuccess();
         String orgSidPath=bv.getOrgSidPath();
         String taskDefKey=bv.getTaskDefKey();
+        String orgPath = bv.getOrgPath();
         //根据业务参数取流程流转的环节 信息
         List<Map<String, Object>> list = (List<Map<String, Object>>)
                 flowtaskService.getProcessCirculationNodesByMap(bv).getData();
@@ -178,7 +178,7 @@ public class FlowableRest implements FlowableFeign {
             return rb.setData("");
         }else{
             Object o = task_map.get("candidateGroups");
-            return getNextUserSids(rb, orgSidPath, o);
+            return getNextUserSids(rb, orgSidPath, o,orgPath);
         }
     }
 

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java

@@ -17,4 +17,7 @@ public class UserQuery implements Query {
     private String roleSid;
     @ApiModelProperty(value = "用户部门sid路径是必传项")
     private String orgSidPath;
+
+    @ApiModelProperty(value = "机构sid",required = false)
+    private String orgPath;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java

@@ -83,7 +83,7 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     @Select("select * from sys_staff_org where staffSid=#{staffSid} AND manageType != 2")
     SysStaffOrg selectAllByStaffSid(String staffSid);
 
-    @Select("select * from sys_staff_org where staffSid=#{sid}")
+    @Select("select * from sys_staff_org where staffSid=#{sid} order by id limit 1")
     SysStaffOrg getOrgByStaffSid(String sid);
 
     @Select("select * from sys_staff_org where staffSid=#{sid} and orgSidPath = #{path} ")

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -971,6 +971,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (StringUtils.isBlank(query.getOrgSidPath())) {
             return rb.setMsg("机构全路径不能为空");
         }
+        if(StringUtils.isBlank(query.getOrgPath())){
             //根据角色sid获取角色的层级
             String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid());
             if (StringUtils.isNotBlank(levelTypeKey)) {
@@ -983,6 +984,10 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             } else {
                 return rb.setMsg("该角色层级未设置");
             }
+        }else{
+            sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), query.getOrgPath());
+        }
+
         return rb.success().setData(sysUserVoList);
 
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/AppScmVehicleEnterlibraryPageQuery.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppScmVehicleEnterlibraryPageQuery implements Query {
 
+    private static final long serialVersionUID = -7472942479865101153L;
     @ApiModelProperty("用户sid")
     private String userSid;
 
@@ -28,4 +29,6 @@ public class AppScmVehicleEnterlibraryPageQuery implements Query {
     @ApiModelProperty("使用组织分公司sid")
     private String useOrgSid;
 
+    private String orgPath;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java

@@ -72,4 +72,6 @@ public class AppScmVehicleExamineInfoVo implements Vo {
 
     private AppScmVehicleVersionVo carDetailPage;
 
+    private String orgPath;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageQuery.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppScmVehicleExaminePageQuery implements Query {
 
+    private static final long serialVersionUID = 5083104469056246314L;
     @ApiModelProperty("用户sid")
     private String userSid;
 
@@ -27,4 +28,6 @@ public class AppScmVehicleExaminePageQuery implements Query {
 
     @ApiModelProperty("使用组织分公司sid")
     private String useOrgSid;
+
+    private String orgPath;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/flowable/ScmCarTransferCompleteDto.java

@@ -30,7 +30,8 @@ public class ScmCarTransferCompleteDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-//    @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
-//    private Map<String, Object> formVariables;
+
+    private String orgPath;
+
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowQuery.java

@@ -56,4 +56,6 @@ public class ScmVehicleReturnFlowQuery implements Query {
     @ApiModelProperty(value = "费用说明")
     private String remarks;
 
+    private String orgPath;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java

@@ -65,9 +65,13 @@ public interface ScmWarehouseFeign {
     public ResultBean<List<Map<String, String>>> fetchByUseOrgSid(@RequestParam("sid") String sid);
 
     @ApiOperation("手机端-获取仓库")
-    @GetMapping("/selectWarehouseByUserSid/{userSid}")
+    @GetMapping(value = "/selectWarehouseByUserSid/{userSid}")
     public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端-获取仓库")
+    @GetMapping(value = "/selectWarehouseByUserSid/{userSid}/{orgPath}")
+    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(@PathVariable("userSid") String userSid, @PathVariable(value = "orgPath", required = false) String orgPath);
+
     @ApiOperation("巡检获取仓库管理人")
     @GetMapping("/selectByAddressSid/{addressSid}")
     public ResultBean<ScmWarehouseVo> selectByAddressSid(@PathVariable("addressSid") String addressSid);

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java

@@ -74,6 +74,11 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid,String orgPath) {
+        return null;
+    }
+
     @Override
     public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {
         return null;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -228,9 +228,12 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
      */
     public IPage<AppScmVehicleEnterlibraryPageVo> getCarWarehousingList(PagerQuery<AppScmVehicleEnterlibraryPageQuery> pq) {
         IPage<AppScmVehicleEnterlibraryPageQuery> page = PagerUtil.queryToPage(pq);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
-        pq.getParams().setUseOrgSid(useOrgSid);
         AppScmVehicleEnterlibraryPageQuery params = pq.getParams();
+        String orgPath = params.getOrgPath();
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
+        }
+        params.setUseOrgSid(orgPath);
         String date = params.getDate();
         if (StringUtils.isNotBlank(date)) {
             String[] s = date.split("至");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java

@@ -92,7 +92,7 @@ public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
      * @param useOrgSid
      * @return
      */
-    AppScmVehicleExamineInfoVo getCarInspectedInfo(@Param("inspectedSid") String inspectedSid, @Param("useOrgSid") String useOrgSid);
+    AppScmVehicleExamineInfoVo getCarInspectedInfo(@Param("inspectedSid") String inspectedSid);
 
     /**
      * 手机端-验车管理详情

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@@ -61,10 +61,10 @@
                inboundDate,
                modelSid,
                configSid,
-               engineNo
+               engineNo,
+                sve.useOrgSid as orgPath
         FROM scm_vehicle_examine sve
         WHERE sve.sid = #{inspectedSid}
-          AND sve.useOrgSid = #{useOrgSid}
     </select>
 
     <select id="getCarInspected"

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -224,16 +224,19 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
      */
     public IPage<AppScmVehicleExaminePageVo> getCarInspectedList(PagerQuery<AppScmVehicleExaminePageQuery> pagerQuery) {
         IPage<AppScmVehicleExaminePageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-        pagerQuery.getParams().setUseOrgSid(useOrgSid);
         AppScmVehicleExaminePageQuery params = pagerQuery.getParams();
+        String orgPath = params.getOrgPath();
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        }
+        params.setUseOrgSid(orgPath);
         String date = params.getDate();
         if (StringUtils.isNotBlank(date)) {
             String[] s = date.split("至");
             params.setDateStart(s[0]);
             params.setDateEnd(s[1]);
         }
-        QueryWrapper<AppScmVehicleExaminePageVo> qw = appQueryWrapper(pagerQuery.getParams());
+        QueryWrapper<AppScmVehicleExaminePageVo> qw = appQueryWrapper(params);
         IPage<AppScmVehicleExaminePageVo> iPage = baseMapper.getCarInspectedList(page, qw, params.getNames());
         List<AppScmVehicleExaminePageVo> records = iPage.getRecords();
         for (AppScmVehicleExaminePageVo record : records) {
@@ -278,8 +281,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         String type2 = "02"; // 验车相关照片 02
         List<String> factoryImages = new ArrayList<>();
         List<String> carInspectedImages = new ArrayList<>();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid, useOrgSid);
+//        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        AppScmVehicleExamineInfoVo vo = baseMapper.getCarInspectedInfo(inspectedSid);
         if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(vo.getPurchaseKey())) {
             vo.setEditVin(true);
         } else {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -685,6 +685,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         if (scmVehicleGressionVehDtos1.size() == 0) {
             return rb.setMsg("车辆列表不能为空！");
         }
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -697,6 +701,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            //用户的部门全路径sid
+            bv.setOrgSidPath(orgSidPath);
+        }else{
+            bv.setOrgPath(orgPath);
+        }
+
         ScmVehicleGression scmVehicleGression = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, scmVehicleGression);
         if (r == 3) {
@@ -769,12 +779,9 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             baseVehicleTempstateDto.setBusSid(businessSid);
             baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
         }
-        //创建BusinessVariables实体对象
-        BusinessVariables bv = new BusinessVariables();
+
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
         Map<String, Object> variables = new HashMap<>();
-        //用户的部门全路径sid
-        bv.setOrgSidPath(orgSidPath);
         //业务sid
         bv.setBusinessSid(businessSid);
         //用户sid
@@ -867,6 +874,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(bv.getOrgPath())) {
+            if (StringUtils.isBlank(bv.getOrgSidPath())) {
+                return rb.setMsg("参数错误：orgSidPath");
+            }
+        }
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         ScmVehicleGression scmVehicleGression = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = new HashMap<>();

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

@@ -346,6 +346,11 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(bv.getOrgPath())){
+            if(StringUtils.isBlank(bv.getOrgSidPath())){
+                return rb.setMsg("参数错误：orgSidPath");
+            }
+        }
         //查询对象转换为map集合
         boolean isTrue = isTrue(bv.getBusinessSid());
         if (isTrue) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java

@@ -1,9 +1,7 @@
 package com.yxt.anrui.scm.biz.scmwarehouse;
 
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.*;
-import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -108,14 +106,13 @@ public class ScmWarehouseRest implements ScmWarehouseFeign {
     }
 
     @Override
-    @ApiOperation("手机端-获取仓库")
-    @GetMapping("/selectWarehouseByUserSid/{userSid}")
     public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid) {
-        ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(userSid)) {
-            return rb.setMsg("用户sid不能为空");
+        return scmWarehouseService.selectWarehouseByUserSid(userSid, "");
     }
-        return scmWarehouseService.selectWarehouseByUserSid(userSid);
+
+    @Override
+    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid, String orgPath) {
+        return scmWarehouseService.selectWarehouseByUserSid(userSid, orgPath);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -144,11 +144,13 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
         return rb.success().setData(maps);
     }
 
-    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid) {
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-//        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
-        List<AppScmWarehouseVo> list = baseMapper.selectWarehouseByUserSid(useOrgSid);
-        return new ResultBean<List<AppScmWarehouseVo>>().success().setData(list);
+    public ResultBean<List<AppScmWarehouseVo>> selectWarehouseByUserSid(String userSid, String orgPath) {
+        ResultBean<List<AppScmWarehouseVo>> rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(orgPath)){
+            orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
+        List<AppScmWarehouseVo> list = baseMapper.selectWarehouseByUserSid(orgPath);
+        return rb.success().setData(list);
     }
 
     public ResultBean<ScmWarehouseVo> selectByAddressSid(String addressSid) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
 
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit.*;
-import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*;
@@ -54,8 +53,8 @@ public interface AppBusMainDepositFeign {
     public ResultBean<List<DepositRecordsVo>> getDepositRecords(@PathVariable("depositBillNo") String depositBillNo);
 
     @ApiOperation("根据仓库sid 获取车架号")
-    @GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}")
-    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
+    @GetMapping({"/getVinByWarehouseSid/{warehouseSid}/{userSid}","/getVinByWarehouseSid/{warehouseSid}/{userSid}/{orgPath}"})
+    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid,@PathVariable(value = "orgPath",required = false) String orgPath);
 
     @ApiOperation("删除虚拟订单")
     @DeleteMapping("/deleteVirtualOrder/{virtualOrderSid}/{userSid}")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java

@@ -148,7 +148,7 @@ public class AppBusMainDepositFeignFallback implements AppBusMainDepositFeign {
     }
 
     @Override
-    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
+    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid,String orgPath) {
         return null;
     }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java

@@ -35,9 +35,10 @@ public class CompanyShuntingDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-//    private List<CompanyShuntingList> json;
 
     private String json;
 
+    private String orgPath;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/flowable/ExternalPurchaseDto.java

@@ -34,4 +34,6 @@ public class ExternalPurchaseDto implements Dto {
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
+
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceCompleteDto.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Map;
 
 @Data
 public class ModelModPriceCompleteDto implements Dto {
@@ -31,6 +30,6 @@ public class ModelModPriceCompleteDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-    @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
-    private Map<String, Object> formVariables;
+    private String orgPath;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/purchaseReturn/VehicleReturnFlowQuery.java

@@ -1,16 +1,10 @@
 package com.yxt.anrui.terminal.api.supplychain.purchaseReturn;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 @Data
 public class VehicleReturnFlowQuery implements Query {
     private static final long serialVersionUID = 7509263507958557992L;
@@ -28,14 +22,10 @@ public class VehicleReturnFlowQuery implements Query {
     private String businessSid;
     @ApiModelProperty(value = "taskDefKey")
     private String taskDefKey;
-    /**
-     * 当前用户部门的全路径
-     */
-    private String orgSidPath;
-    /**
-     * 业务参数，按需传递
-     */
-    private Map<String, Object> formVariables;
+
+    /*private String orgSidPath;
+    private Map<String, Object> formVariables;*/
+    private String orgPath;
 
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppEnterlibraryPageQuery.java

@@ -7,6 +7,7 @@ import lombok.Data;
 @Data
 public class AppEnterlibraryPageQuery implements Query {
 
+    private static final long serialVersionUID = 744520639509950552L;
     @ApiModelProperty("用户sid")
     private String userSid;
 
@@ -20,6 +21,6 @@ public class AppEnterlibraryPageQuery implements Query {
     private String date;
 
     @ApiModelProperty("使用组织分公司sid")
-    private String useOrgSid;
+    private String orgPath;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java

@@ -72,4 +72,6 @@ public class AppExamineInfoVo implements Vo {
 
     private AppScmVehicleVo carDetailPage;
 
+    private String orgPath;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageQuery.java

@@ -29,4 +29,6 @@ public class AppExaminePageQuery implements Query {
     @ApiModelProperty("使用组织分公司sid")
     private String useOrgSid;*/
 
+    private String orgPath;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/flowable/CompleteGressionDto.java

@@ -34,6 +34,8 @@ public class CompleteGressionDto implements Dto {
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
+    @ApiModelProperty("机构sid")
+    private String orgPath;
 
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/flowable/UnsoldBuyoutDto.java

@@ -34,4 +34,6 @@ public class UnsoldBuyoutDto implements Dto {
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
+
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/flowable/VehicleApplyDto.java

@@ -34,4 +34,6 @@ public class VehicleApplyDto implements Dto {
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
+
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java

@@ -26,9 +26,8 @@
 package com.yxt.anrui.terminal.biz.autoservice.virtualOrders;
 
 
-import com.yxt.anrui.terminal.api.autoservice.virtualOrders.*;
+import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositFeign;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit.*;
-import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*;
@@ -100,8 +99,8 @@ public class AppBusMainDepositRest implements AppBusMainDepositFeign {
      * @return
      */
     @Override
-    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
-        return appBusMainDepositService.getVinByWarehouseSid(warehouseSid, userSid);
+    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid,String orgPath) {
+        return appBusMainDepositService.getVinByWarehouseSid(warehouseSid, userSid,orgPath);
     }
 
     /**

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

@@ -30,15 +30,19 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo;
 import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.buscenter.api.busdeposit.*;
+import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
+import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
+import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositDetailInfoQuery;
+import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
-import com.yxt.anrui.buscenter.api.busmaindeposit.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
+import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositQuery;
+import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
+import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit.*;
-import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.ScmVirtualOrderTaskQuery;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*;
@@ -147,10 +151,10 @@ public class AppBusMainDepositService {
      * @param userSid
      * @return
      */
-    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid) {
+    public ResultBean<List<AppWarehouseVinVo>> getVinByWarehouseSid(String warehouseSid, String userSid, String orgPath) {
         ResultBean<List<AppWarehouseVinVo>> rb = ResultBean.fireFail();
         List<AppWarehouseVinVo> list = new ArrayList<>();
-        ResultBean<List<AppScmWarehouseVinVo>> resultBean = baseVehicleFeign.getVinByWarehouseSid(warehouseSid, userSid);
+        ResultBean<List<AppScmWarehouseVinVo>> resultBean = baseVehicleFeign.getVinByWarehouseSid(warehouseSid, userSid, orgPath);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java

@@ -18,6 +18,7 @@ import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanySh
 import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery;
 import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingTaskQuery;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,6 +56,10 @@ public class CompanyShuntingService {
 
     public ResultBean agreeCompanyShuntingInfo(CompanyShuntingDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto();
+        BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto);
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -67,9 +72,12 @@ public class CompanyShuntingService {
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto();
-        BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto);
             baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath);
+        }else{
+            baseInterNalPurchaseCompleteDto.setOrgPath(orgPath);
+
+        }
+
         ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -79,10 +87,14 @@ public class CompanyShuntingService {
 
     public ResultBean upDateAgreeCompanyShuntingInfo(CompanyShuntingDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto();
+        BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto);
         String json = dto.getJson();
         List<Map<String, Object>> list2 = JSON.parseObject(json, new TypeReference<List<Map<String, Object>>>() {
         });
         Map<String, Object> map = new HashMap<>();
+        String orgPath = dto.getOrgPath();
+        if(StringUtils.isBlank(orgPath)){
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -95,11 +107,13 @@ public class CompanyShuntingService {
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto();
-        BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto);
+            baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath);
+        }else{
+            baseInterNalPurchaseCompleteDto.setOrgPath(orgPath);
+        }
+
         map.put("baseInternalPurchaseVehicles", list2);
         baseInterNalPurchaseCompleteDto.setFormVariables(map);
-        baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath);
         ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java

@@ -16,6 +16,7 @@ import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.External
 import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalPurchaseQuery;
 import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalPurchaseTaskQuery;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,6 +53,10 @@ public class ExternalPurchaseService {
 
     public ResultBean agreeExternalPurchaseInfo(ExternalPurchaseDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
+        BeanUtil.copyProperties(dto, businessVariablesDto);
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -64,9 +69,12 @@ public class ExternalPurchaseService {
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
-        BeanUtil.copyProperties(dto, businessVariablesDto);
             businessVariablesDto.setOrgSidPath(orgSidPath);
+        } else {
+            businessVariablesDto.setOrgPath(orgPath);
+        }
+
+
         ResultBean resultBean = baseOutsourcingApplicationFeign.complete(businessVariablesDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.terminal.api.supplychain.modelAdjust.*;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -108,6 +109,10 @@ public class AppBaseModelModpriceService {
      */
     public ResultBean agreeModelAdjustInfo(ModelModPriceCompleteDto query) {
         ResultBean rb = ResultBean.fireFail();
+        BaseModelModPriceCompleteDto baseModelModPriceCompleteDto = new BaseModelModPriceCompleteDto();
+        BeanUtil.copyProperties(query, baseModelModPriceCompleteDto);
+        String orgPath = query.getOrgPath();
+        if(StringUtils.isBlank(orgPath)){
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(query.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -120,9 +125,12 @@ public class AppBaseModelModpriceService {
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        BaseModelModPriceCompleteDto baseModelModPriceCompleteDto = new BaseModelModPriceCompleteDto();
-        BeanUtil.copyProperties(query, baseModelModPriceCompleteDto);
             baseModelModPriceCompleteDto.setOrgSidPath(orgSidPath);
+        }else{
+            baseModelModPriceCompleteDto.setOrgPath(orgPath);
+
+        }
+
         ResultBean resultBean = baseModelModpriceFeign.complete(baseModelModPriceCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/purchaseReturn/AppScmVehicleReturnService.java

@@ -20,6 +20,7 @@ import com.yxt.anrui.scm.api.scmvehiclereturn.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehiclereturn.flow.GetNodeVo;
 import com.yxt.anrui.terminal.api.supplychain.purchaseReturn.*;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -179,6 +180,10 @@ public class AppScmVehicleReturnService {
      */
     public ResultBean agreePurchaseReturnInfo(VehicleReturnFlowQuery vehicleReturnFlowQuery) {
         ResultBean rb = ResultBean.fireFail();
+        ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery = new ScmVehicleReturnFlowQuery();
+        BeanUtil.copyProperties(vehicleReturnFlowQuery, scmVehicleReturnFlowQuery);
+        String orgPath = vehicleReturnFlowQuery.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(vehicleReturnFlowQuery.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -191,9 +196,11 @@ public class AppScmVehicleReturnService {
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        ScmVehicleReturnFlowQuery scmVehicleReturnFlowQuery = new ScmVehicleReturnFlowQuery();
-        BeanUtil.copyProperties(vehicleReturnFlowQuery, scmVehicleReturnFlowQuery);
             scmVehicleReturnFlowQuery.setOrgSidPath(orgSidPath);
+        } else {
+            scmVehicleReturnFlowQuery.setOrgPath(orgPath);
+        }
+
         ResultBean resultBean = scmVehicleReturnFeign.complete(scmVehicleReturnFlowQuery);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -153,6 +154,10 @@ public class AppScmVehicleGressionService {
 
     public ResultBean agreeCarTransferInfo(CompleteGressionDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        ScmCarTransferCompleteDto scmCarTransferCompleteDto = new ScmCarTransferCompleteDto();
+        BeanUtil.copyProperties(dto, scmCarTransferCompleteDto);
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -165,9 +170,10 @@ public class AppScmVehicleGressionService {
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        ScmCarTransferCompleteDto scmCarTransferCompleteDto = new ScmCarTransferCompleteDto();
-        BeanUtil.copyProperties(dto, scmCarTransferCompleteDto);
             scmCarTransferCompleteDto.setOrgSidPath(orgSidPath);
+        } else {
+            scmCarTransferCompleteDto.setOrgPath(orgPath);
+        }
         ResultBean resultBean = scmVehicleGressionFeign.complete(scmCarTransferCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java

@@ -16,6 +16,7 @@ import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyout
 import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutQuery;
 import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutTaskQuery;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,6 +53,10 @@ public class UnsoldBuyoutService {
 
     public ResultBean agreeUnsoldBuyoutInfo(UnsoldBuyoutDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        BaseActualSalesCompleteDto baseActualSalesCompleteDto = new BaseActualSalesCompleteDto();
+        BeanUtil.copyProperties(dto, baseActualSalesCompleteDto);
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(orgPath)) {
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -64,9 +69,10 @@ public class UnsoldBuyoutService {
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        BaseActualSalesCompleteDto baseActualSalesCompleteDto = new BaseActualSalesCompleteDto();
-        BeanUtil.copyProperties(dto, baseActualSalesCompleteDto);
             baseActualSalesCompleteDto.setOrgSidPath(orgSidPath);
+        } else {
+            baseActualSalesCompleteDto.setOrgPath(orgPath);
+        }
         ResultBean resultBean = baseVehicleActualSalesFeign.complete(baseActualSalesCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java

@@ -18,6 +18,7 @@ import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApply
 import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyQuery;
 import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyTaskQuery;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -63,6 +64,10 @@ public class VehicleApplyService {
 
     public ResultBean agreeVehicleApplyInfo(VehicleApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        String orgPath = dto.getOrgPath();
+        BusVehicleApplyCompleteDto busVehicleApplyCompleteDto = new BusVehicleApplyCompleteDto();
+        BeanUtil.copyProperties(dto, busVehicleApplyCompleteDto);
+        if (StringUtils.isBlank(orgPath)) {
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -75,9 +80,10 @@ public class VehicleApplyService {
             }
             //用户的组织全路径
             String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        BusVehicleApplyCompleteDto busVehicleApplyCompleteDto = new BusVehicleApplyCompleteDto();
-        BeanUtil.copyProperties(dto, busVehicleApplyCompleteDto);
             busVehicleApplyCompleteDto.setOrgSidPath(orgSidPath);
+        } else {
+            busVehicleApplyCompleteDto.setOrgPath(orgPath);
+        }
         ResultBean resultBean = busVehicleApplyFeign.complete(busVehicleApplyCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());