销售订单-完善虚拟订单分页列表

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>
 

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());
+                    }
                 }
             }
         }