From cd78f4208a6a6185f9bd6dbc78d7eaa853291d82 Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Sat, 29 Oct 2022 15:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=9F=A5=E8=AF=A2orgPath?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basemodelconfig/ModelConfigListQuery.java |  2 ++
 .../BaseModelConfigService.java               |  9 ++++++++-
 .../biz/basevehicle/BaseVehicleService.java   | 20 ++++++++++---------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java
index 6e5e84d932..1369d5f0c5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java
@@ -58,6 +58,8 @@ public class ModelConfigListQuery implements Query {
     private String userSid;
     @ApiModelProperty("分公司：后端内部使用")
     private String useOrg;
+//    @ApiModelProperty("分公司：机构sid")
+//    private String orgPath;
 
 
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
index dc5dba99f7..2a8eb18b0f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
@@ -507,6 +507,13 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
 
     public ModelConfigVo getModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
+//        String orgPath = pagerQuery.getParams().getOrgPath();
+//        String orgSid = "";
+//        if (StringUtils.isBlank(orgPath)) {
+//            orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+//        } else {
+//            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+//        }
         // 1、根据业务员部门sid查询分公司sid
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         if (StringUtils.isNotBlank(orgSid)) {
@@ -708,7 +715,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
 //                    && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
                     ? (appModelConfigListVo.getMultimedia() + "/") : "";
 
-            String configName =  slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
+            String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
                     baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
             appModelConfigListVo.setConfigName(configName);
         }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 35d6e1fbc9..1ae2f98535 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -1201,13 +1201,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public IPage<VehicleModelPriceVo> getModelList(PagerQuery<VehicleModelPriceQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
         // 1、根据业务员部门sid查询分公司sid
-        String orgPath = pagerQuery.getParams().getOrgPath();
-        String orgSid = "";
-        if (StringUtils.isBlank(orgPath)) {
-            orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        } else {
-            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-        }
+//        String orgPath = pagerQuery.getParams().getOrgPath();
+//        String orgSid = "";
+//        if (StringUtils.isBlank(orgPath)) {
+//            orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+//        } else {
+//            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+//        }
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         if (StringUtils.isNotBlank(orgSid)) {
             pagerQuery.getParams().setUseOrg(orgSid);
         }
@@ -1867,8 +1868,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     public AppBaseConfigNowCarVo getModelNowCarList(AppBaseConfigNowCarQuery pagerQuery) {
 //        AppBaseConfigNowCarQuery query = pagerQuery.getParams();
-        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getUserSid()).getData();
-        pagerQuery.setUseOrg(data.getSid());
+//        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getUserSid()).getData();
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getUserSid()).getData();
+        pagerQuery.setUseOrg(orgSid);
         AppBaseConfigNowCarVo appBaseConfigNowCarVo = baseMapper.selectByModelSidAndConfigSid(pagerQuery.getModelSid(), pagerQuery.getConfigSid(), pagerQuery.getUseOrg());
         List<AppBaseVinNowCarVo> vinNowCarVos = new ArrayList<>();
         QueryWrapper<AppBaseVinNowCarVo> qw = modelNowCarWrapper(pagerQuery);