From 8372dde6c084e1c8058027fe6308540914e8dbd3 Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Sat, 15 Oct 2022 16:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=BD=A6=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java   | 2 ++
 .../base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml   | 3 ++-
 .../base/biz/basevehmodelconfig/BaseVehmodelConfigService.java | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java
index da841fd237..77c29314bc 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleVos.java
@@ -34,4 +34,6 @@ public class BaseVehmodelConfigVehicleVos implements Vo {
     private String configCode;
     @ApiModelProperty(value = "更多配置")
     private String otherConfig;
+    @ApiModelProperty(value = "品牌sid")
+    private String carBrand;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
index 776dd522be..41ec2c6345 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
@@ -343,7 +343,8 @@
         bvc.insideCode,
         bvm.vehicleTypeCode,
         bmc.configCode,
-        bmc.otherConfig
+        bmc.otherConfig,
+        bvm.carBrand
         FROM
         base_vehmodel_config bvc
         LEFT JOIN base_vehicle_model bvm
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
index bdaae48795..56ee9d83c3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
@@ -644,7 +644,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
             qw.like("bmc.configName", query.getConfigName());
         }
         if (StringUtils.isNotBlank(query.getCarBrandSid())){
-            qw.like("bmc.brandSid", query.getCarBrandSid());
+            qw.eq("bvm.carBrand", query.getCarBrandSid());
         }
         qw.eq("bvm.isDelete", 0);
         qw.eq("bmc.isDelete", 0);