From 2efb7b2f1ea85c8c27a6fe35c1bd98afe117351d Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 28 Jul 2022 09:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusVehicleApplyDetailService.java         | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
index 3fd2a5188f..697e1b6b0d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
@@ -141,26 +141,29 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
                     vo.setContractPrice(vo.getContractPrice());
                 }
                 BusVehicleApplySzVo busVehicleApplySz = busVehicleApplySzService.selectByDetails(vo.getSid());
-                String overallDimension = "";
-                if (StringUtils.isNotBlank(busVehicleApplySz.getWkLong())) {
-                    overallDimension = "长  " + busVehicleApplySz.getWkLong() + "  mm,";
-                }else{
-                    overallDimension = "长  mm,";
-                }
-                if (StringUtils.isNotBlank(busVehicleApplySz.getWkWide())) {
-                    overallDimension = overallDimension+ "宽  " + busVehicleApplySz.getWkWide() + "  mm,";
-                }else{
-                    overallDimension = overallDimension+"宽  mm,";
-                }
-                if (StringUtils.isNotBlank(busVehicleApplySz.getWkHigh())) {
-                    overallDimension = overallDimension+"高  " + busVehicleApplySz.getWkHigh() + "  mm";
-                }else{
-                    overallDimension = overallDimension+"高  mm";
+                if(busVehicleApplySz != null){
+                    String overallDimension = "";
+                    if (StringUtils.isNotBlank(busVehicleApplySz.getWkLong())) {
+                        overallDimension = "长  " + busVehicleApplySz.getWkLong() + "  mm,";
+                    }else{
+                        overallDimension = "长  mm,";
+                    }
+                    if (StringUtils.isNotBlank(busVehicleApplySz.getWkWide())) {
+                        overallDimension = overallDimension+ "宽  " + busVehicleApplySz.getWkWide() + "  mm,";
+                    }else{
+                        overallDimension = overallDimension+"宽  mm,";
+                    }
+                    if (StringUtils.isNotBlank(busVehicleApplySz.getWkHigh())) {
+                        overallDimension = overallDimension+"高  " + busVehicleApplySz.getWkHigh() + "  mm";
+                    }else{
+                        overallDimension = overallDimension+"高  mm";
+                    }
+                    busVehicleApplySz.setOverallDimension(overallDimension);
+                    busVehicleApplySz.setPlateThickness("底  "+busVehicleApplySz.getPlateThicknessBottom() + "  mm,边  " + busVehicleApplySz.getPlateThicknessBottom() + "  mm");
+                    vo.setBusVehicleApplySz(busVehicleApplySz);
+                    vo.setGuidePrice(busVehicleApplySz.getGuidePrice());
                 }
-                busVehicleApplySz.setOverallDimension(overallDimension);
-                busVehicleApplySz.setPlateThickness("底  "+busVehicleApplySz.getPlateThicknessBottom() + "  mm,边  " + busVehicleApplySz.getPlateThicknessBottom() + "  mm");
-                vo.setBusVehicleApplySz(busVehicleApplySz);
-                vo.setGuidePrice(busVehicleApplySz.getGuidePrice());
+
             }
         }
         return busVehicleApplyDetailVos;