diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
index c6b1f1f212..6234c6434b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
@@ -187,6 +187,8 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
 
     List<AppModelConfigListVo> getModelConfigPageList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw);
 
+    List<AppModelConfigListVo> getNowConfigList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw);
+
     List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
 
     AppModelConfigListVo getCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
index ef7a965647..90f771e102 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
@@ -528,10 +528,6 @@
         LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
-            and
-            ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bmc.sid
-            AND
-            lockedState = '03' ) >0
         </where>
         ORDER BY
         nowCarNum DESC
@@ -578,4 +574,51 @@
                  LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
+    <select id="getNowConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
+        SELECT
+        bmc.sid as configSid,
+        bmc.carColor,
+        bmc.slowMachine,
+        bmc.rearViewMirror,
+        bmc.tireSize,
+        bmc.specification,
+        bmc.rearAxleRatio,
+        bmc.airConditioner,
+        bmc.hubMaterial,
+        bmc.baffleModel,
+        bmc.suspension,
+        bmc.seat,
+        bmc.tireCover,
+        bmc.saddle,
+        bmc.wheelbase,
+        bmc.bumper,
+        bmc.configuringBao,
+        bmc.independentSources,
+        bmc.fuelTank,
+        bmc.multimedia,
+        bvc.guidedPrice as price,
+        bvc.priceValidity,
+        bvm.sid as modelSid,
+        bvm.vehicleAlias as modelName,
+        bvm.brandName as brand,
+        bvm.carBrand as brandSid,
+        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bmc.sid AND
+        lockedState = '03' ) AS nowCarNum,
+        ( SELECT SUM(cast(bvad.quantity as signed)) as quantity FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid
+        = bvc.modelSid
+        and bvad.configSid =
+        bmc.sid) AS produceCarNum
+        FROM base_vehmodel_config bvc
+        LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+        <where>
+            ${ew.sqlSegment}
+            and
+            ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bmc.sid
+            AND
+            lockedState = '03' ) > 0
+        </where>
+        ORDER BY
+        nowCarNum DESC
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
index 1dab671675..118451b71b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
@@ -272,7 +272,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     @Override
     public ResultBean<AppModelConfigVo> getNowConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
         ResultBean<AppModelConfigVo> rb = ResultBean.fireFail();
-        AppModelConfigVo vo = baseModelConfigService.getModelConfigList(pagerQuery);
+        AppModelConfigVo vo = baseModelConfigService.getNowConfigList(pagerQuery);
         return rb.success().setData(vo);
     }
 }
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 efdefdde01..129c27bac7 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
@@ -537,7 +537,63 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         vo.setModelConfigList(appModelConfigListVos);
         return vo;
     }
+    public AppModelConfigVo getNowConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
 
+        String userSid = pagerQuery.getParams().getUserSid();
+        // 1、根据业务员部门sid查询分公司 查询orgSidPath（部门路径）
+        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        if (data != null) {
+            // 2) 根据orgSidPath（部门路径）判断分公司sid
+            pagerQuery.getParams().setUseOrg(data.getSid());
+        }
+        String modelSid = pagerQuery.getParams().getModelSid();
+        String useOrgSid = data.getSid();
+        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid, useOrgSid);
+        String type = "0002";
+        String path = fileUploadComponent.getUrlPrefix();
+        List<String> modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path);
+        vo.setModelImage(modelImages);
+
+        //基础配置拼接
+        List<ConfigInfo> list = new ArrayList<>();
+        list.add(getConfigValue("品牌", vo.getBrandName()));
+        list.add(getConfigValue("功能", vo.getVehicleTypeValue()));
+        list.add(getConfigValue("系列", vo.getProductLineValue()));
+        list.add(getConfigValue("驱动", vo.getDriveFormValue()));
+        list.add(getConfigValue("马力", vo.getPowerValue()));
+        list.add(getConfigValue("版本", vo.getVehicleVersionValue()));
+        list.add(getConfigValue("燃料", vo.getFuelTypeValue()));
+        list.add(getConfigValue("变速箱", vo.getGearboxTypeValue()));
+        list.add(getConfigValue("细分市场", vo.getMarketSegments()));
+        list.add(getConfigValue("系别", vo.getDepartment()));
+        list.add(getConfigValue("发动机型号", vo.getEngineTypeValue()));
+        list.add(getConfigValue("公告型号", vo.getAnnouncementModel()));
+        list.add(getConfigValue("规格型号", vo.getSpecifications()));
+        list.add(getConfigValue("货箱", vo.getPackingCase()));
+        list.add(getConfigValue("内部编码", vo.getInsideCode()));
+        vo.setConfigList(list);
+        //配置列表
+        IPage<AppModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
+        List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getNowConfigList(page, qw);
+        long pages = page.getPages();
+        vo.setPages((int) pages);
+        //分公司配置列表查询
+        for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
+            if (StringUtils.isBlank(appModelConfigListVo.getProduceCarNum())) {
+                appModelConfigListVo.setProduceCarNum("0");
+            }
+            String useOrg = data.getSid();
+            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), useOrg);
+            for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
+                moreConfigVo.setCompanyName(data.getName());
+            }
+            appModelConfigListVo.setMoreList(moreConfigVos);
+        }
+        addDonfigName(appModelConfigListVos);
+        vo.setModelConfigList(appModelConfigListVos);
+        return vo;
+    }
     /**
      * 拼接常用车型字段（configName）
      *
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 4fedc8072f..45d3e22123 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -545,29 +545,29 @@
     </select>
 
     <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
-        SELECT bvm.sid                                                                                         AS modelSid,
-               bvm.vehicleAlias                                                                                AS modelName,
-               bvm.brandName,
-               bvm.carBrand                                                                                    AS brandSid,
-               bvm.vehicleVersionValue                                                                         AS versionValue,
-               bvm.fuelTypeValue,
-               bvm.gearboxTypeValue,
-               (SELECT CONCAT(MIN(bv.guidedPrice), '-', MAX(bv.guidedPrice))
-                FROM base_vehicle bv
-                WHERE bv.modelSid = bvm.sid
-                  AND bv.useOrg = #{useOrgSid})                                                                AS guidedPrice,
-               (SELECT count(*)
-                FROM base_vehicle bv
-                WHERE bv.modelSid = bvm.sid
-                  AND bv.useOrg = #{useOrgSid})                                                                AS configNum,
-               (SELECT count(*)
-                FROM base_vehicle bv
-                WHERE bv.modelSid = bvm.sid
-                  AND lockedState = '03')                                                                      AS nowCarNum
+        SELECT DISTINCT
+        bvm.sid AS modelSid,
+        bvm.vehicleAlias AS modelName,
+        bvm.brandName,
+        bvm.carBrand AS brandSid,
+        bvm.vehicleVersionValue AS versionValue,
+        bvm.fuelTypeValue,
+        bvm.gearboxTypeValue,
+        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
+        FROM base_vehmodel_config bvc
+        WHERE bvc.modelSid = bvm.sid
+        AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
+        (SELECT count(*)
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
-            ${ew.customSqlSegment}
-
+        WHERE bv.modelSid = bvm.sid
+        AND bv.useOrg = #{useOrgSid}) AS configNum,
+        (SELECT count(*)
+        FROM base_vehicle bv
+        WHERE bv.modelSid = bvm.sid
+        AND lockedState = '03') AS nowCarNum
+        FROM base_vehicle bv
+        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+        ${ew.customSqlSegment}
     </select>
 
     <select id="vehicleReturnPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleReturnVo">
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 03b0871dcb..0b35955ae8 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
@@ -839,34 +839,34 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.like("bvm.vehicleAlias", pagerQuery.getName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准
-            qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard());
+            qw.eq("bvm.emissionStandardValue", pagerQuery.getEmissionStandard());
         }
         if (StringUtils.isNotBlank(pagerQuery.getDriver())) { // 驱动
-            qw.eq("bvm.driveForm", pagerQuery.getDriver());
+            qw.eq("bvm.driveFormValue", pagerQuery.getDriver());
         }
         if (StringUtils.isNotBlank(pagerQuery.getGearbox())) { // 变速箱
-            qw.eq("bvm.gearboxType", pagerQuery.getGearbox());
+            qw.eq("bvm.gearboxTypeValue", pagerQuery.getGearbox());
         }
         if (StringUtils.isNotBlank(pagerQuery.getSeries())) { // 产品系列
-            qw.eq("bvm.department", pagerQuery.getSeries());
+            qw.eq("bvm.departmentValue", pagerQuery.getSeries());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVehicleFunction())) { // 功能
-            qw.eq("bvm.vehicleType", pagerQuery.getVehicleFunction());
+            qw.eq("bvm.vehicleTypeValue", pagerQuery.getVehicleFunction());
         }
         if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) { // 细分市场
-            qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
+            qw.eq("bvm.marketSegmentsValue", pagerQuery.getMarketSegments());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) { // 版本
-            qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion());
+            qw.eq("bvm.vehicleVersionValue", pagerQuery.getVehicleVersion());
         }
         if (StringUtils.isNotBlank(pagerQuery.getFuelType())) { // 燃料
-            qw.eq("bvm.fuelType", pagerQuery.getFuelType());
+            qw.eq("bvm.fuelTypeValue", pagerQuery.getFuelType());
         }
         if (StringUtils.isNotBlank(pagerQuery.getHorsepower())) { // 马力
-            qw.eq("bvm.power", pagerQuery.getHorsepower());
+            qw.eq("bvm.powerValue", pagerQuery.getHorsepower());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBrand())) { // 品牌
-            qw.eq("bvm.carBrand", pagerQuery.getBrand());
+            qw.eq("bvm.brandName", pagerQuery.getBrand());
         }
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
             qw.eq("bv.useOrg", pagerQuery.getUseOrg());
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
index d94d241271..238bb2bb34 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
@@ -12,6 +12,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
index e7889cd06d..7d5f4df158 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
@@ -40,6 +40,7 @@
         bmd.createDate AS virtualOrderDate,
         bmd.depositBillTypeKey as virtualOrderType,
         bmd.staffName AS sellerName,
+        bmd.nodeState AS virtualOrderState,
         bmd.remarks
         FROM bus_main_deposit bmd
         LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
@@ -50,6 +51,7 @@
                 and bmd.billNo LIKE concat('%', #{name}, '%')
             </if>
         </where>
+        ORDER BY bmd.createTime desc
         <if test="name != '' and name != null ">
             UNION ALL
             SELECT bmd.sid AS virtualOrderSid,
@@ -57,6 +59,7 @@
             bmd.createDate AS virtualOrderDate,
             bmd.depositBillTypeKey as virtualOrderType,
             bmd.staffName AS sellerName,
+            bmd.nodeState AS virtualOrderState,
             bmd.remarks
             FROM bus_main_deposit bmd
             LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
@@ -73,6 +76,7 @@
             bmd.createDate AS virtualOrderDate,
             bmd.depositBillTypeKey as virtualOrderType,
             bmd.staffName AS sellerName,
+            bmd.nodeState AS virtualOrderState,
             bmd.remarks
             FROM bus_main_deposit bmd
             LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
@@ -246,8 +250,8 @@
     </select>
     <select id="selByBillSidCount" resultType="java.lang.Integer">
         select count(*)
-        from bus_deposit_vehicle_customer bdvc
-        where bdvc.billSid = #{virtualOrderSid}
+        from bus_deposit_vehicle bdv
+        where bdv.billSid = #{virtualOrderSid}
     </select>
     <select id="selDepositByBillsid"
             resultType="com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo">
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index f2a276bc77..aaf390da54 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -59,6 +59,8 @@ import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -101,6 +103,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
 
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
     @Autowired
     private DictCommonFeign dictCommonFeign;
 
@@ -587,11 +592,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         pagerQuery.getParams().setStaffSid(staffSid);
         QueryWrapper<AppBusMainDepositVo> qw = aaQueryWrapper(pagerQuery.getParams());
         AppBusMainDepositQuery params = pagerQuery.getParams();
-        IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw,params.getName());
+        IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw, params.getName());
         for (AppBusMainDepositVo record : iPage.getRecords()) {
             String virtualOrderSid = record.getVirtualOrderSid();
-            int count = baseMapper.selByBillSidCount(virtualOrderSid);
-            record.setCarNumber(String.valueOf(count));
             if (record.getVirtualOrderType().equals("01")) {
                 AppBusDepositBusDetailsVo vo = baseMapper.selDepositByBillsid(virtualOrderSid);
                 record.setPayName(vo.getPayName());
@@ -600,6 +603,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 record.setCarNumber(vo.getCarNumber());
             } else if (record.getVirtualOrderType().equals("02")) {
                 BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);
+                int count = baseMapper.selByBillSidCount(virtualOrderSid);
+                record.setCarNumber(String.valueOf(count));
                 record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
                 record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
                 record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
@@ -652,18 +657,20 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public ResultBean
     saveDepositInfo(AppBusDepositBuscenterDto dto) {
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData();
         Date date = new Date();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         //判断订单sid是否有值(无值 新增 有值 修改)
         if (StringUtils.isBlank(dto.getVirtualOrderSid())) { //新增
             BusMainDeposit busMainDeposit = new BusMainDeposit();
+            busMainDeposit.setNodeState("待提交");
             busMainDeposit.setSid(UUID.randomUUID().toString());
             Map<String, String> map = generateBillNo(dto.getUserSid());
             busMainDeposit.setBillNo(map.get("billNo_Num"));
             busMainDeposit.setStaffSid(data.getStaffSid());
             busMainDeposit.setStaffName(data.getStaffName());
             busMainDeposit.setOrgSid(data.getOrgSid());
-            busMainDeposit.setOrgName(data.getOrgName());
+            busMainDeposit.setOrgName(sysOrganizationVo.getName() + "-" + data.getOrgName());
             busMainDeposit.setDepositBillType("订金收取");
             busMainDeposit.setDepositBillTypeKey("01");
             busMainDeposit.setCreateDate(dateFormat.format(date));
@@ -1075,18 +1082,20 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     @Transactional(rollbackFor = Exception.class)
     public ResultBean reserveCarInfo(AppBusDepositVehicleDto dto) {
-        AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
+        AppUserOrgInfoVo appUserOrgInfoVo = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData();
         Date date = new Date();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         if (StringUtils.isBlank(dto.getVirtualOrderSid())) {//新增
             BusMainDeposit busMainDeposit = new BusMainDeposit();
+            busMainDeposit.setNodeState("待提交");
             busMainDeposit.setSid(UUID.randomUUID().toString());
             Map<String, String> map = generateBillNo(dto.getUserSid());
             busMainDeposit.setBillNo(map.get("billNo_Num"));
-            busMainDeposit.setStaffSid(data.getStaffSid());
-            busMainDeposit.setStaffName(data.getStaffName());
-            busMainDeposit.setOrgSid(data.getOrgSid());
-            busMainDeposit.setOrgName(data.getOrgName());
+            busMainDeposit.setStaffSid(appUserOrgInfoVo.getStaffSid());
+            busMainDeposit.setStaffName(appUserOrgInfoVo.getStaffName());
+            busMainDeposit.setOrgSid(appUserOrgInfoVo.getOrgSid());
+            busMainDeposit.setOrgName(sysOrganizationVo.getName() + "-" + appUserOrgInfoVo.getOrgName());
             busMainDeposit.setDepositBillType("车辆预订");
             busMainDeposit.setDepositBillTypeKey("02");
             busMainDeposit.setCreateDate(dateFormat.format(date));