From 2fea8437bd05acf6eec524b1c1bd9f61ca4b7d2f Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 19 Aug 2022 10:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?=E6=8E=92=E4=BA=A7=E6=95=B0=E9=87=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java  | 1 +
 .../anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 a3d1027838..e6f0030a4b 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
@@ -1559,6 +1559,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
                 qw.eq("bvo.useOrgSid", query.getUseOrg());
             }
+            qw.eq("bvo.state",0);
         }
         return qw;
     }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 788a9ec5b7..1ad8c9d2a8 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -2113,7 +2113,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 String x = ",";
                 String x1 = "单台车保费预估金额";
                 String x2 = "入保期数";
-                vo.setInsuranceInfo(busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "万元" + x + x2 + busSalesOrderInsurance.getInsuranceNum() + "期");
+                vo.setInsuranceInfo(busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum() + "期");
             }
         }
         /***************************车型信息***************************************/