From 9d4d858b0733bc4033cd725cbbb058d88c5e3343 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 10 May 2022 15:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busmaindeposit/BusMainDepositMapper.xml        |  4 ++--
 .../biz/busmaindeposit/BusMainDepositService.java      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

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 09715af795..e212da068b 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
@@ -149,13 +149,13 @@
     <select id="orderPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo">
         select bv.brandName,
                bv.modelName,
-               bv.modelotherConfig,
+               bv.modelotherConfig as config,
                bv.modelSid,
                bv.modelConfigSid
         from bus_main_deposit bd
                  left join bus_deposit_vehicle_customer bc
                            on bc.billSid = bd.sid
-                 left join bus_deposit_vehicle bv on bv.billSid = bc.sid
+                 left join bus_deposit_vehicle bv on bv.billSid = bd.sid
             ${ew.customSqlSegment}
     </select>
 
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 475b8cc277..c65754bd06 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
@@ -1457,10 +1457,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         List<PcBusMainDepositVo> list = p.getRecords();
         if (list.size() > 0) {
             for (int i = 0; i < list.size(); i++) {
-                //根据车型sid及配置sid查询单台指导价
-                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid());
-                if (voResultBean.getSuccess()) {
-                    list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
+                if(list.get(i) != null){
+                    //根据车型sid及配置sid查询单台指导价
+                    ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid());
+                    if (voResultBean.getSuccess()) {
+                        list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
+                    }
                 }
             }
         }