From 887e8264dead0b401fbdabc71b7e9bcfab309832 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 30 Aug 2022 20:36:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml    | 2 +-
 .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
index a571bdb297..93c30b354f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
@@ -585,7 +585,7 @@
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrgSid != #{useOrg}
+          AND bvc.useOrgSid != #{useOrg} and LENGTH(bvc.useOrgSid) >0
     </select>
     <select id="getCarConfigSummary" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
         SELECT bmc.sid,
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 21a713e3b1..21f29404af 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -599,6 +599,7 @@
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.useOrgSid != #{useOrg}
         group by bvc.useOrgSid
+        HAVING LENGTH(bvc.useOrgSid)> 0
     </select>
 
     <select id="getAppModelConfig"