From 72928a69d1792f5a5114c886adfeaa4951166726 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 23 Jun 2022 16:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A2=E8=BD=A6=E5=8D=95=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E9=99=A4=E7=8E=B0=E8=BD=A6=E4=B8=BA?=
 =?UTF-8?q?0=E7=9A=84=E8=BD=A6=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basemodelconfig/BaseModelConfigMapper.xml   | 17 +++++++++++------
 .../base/biz/basevehicle/BaseVehicleMapper.xml  |  7 +------
 2 files changed, 12 insertions(+), 12 deletions(-)

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 c78a657fb1..dd9b2ce260 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
@@ -624,7 +624,8 @@
                bvm.vehicleAlias                  as modelName,
                bvm.brandName                     as brand,
                bvm.carBrand                      as brandSid,
-               (SELECT count(*)
+               (SELECT
+                    count(*)
                 FROM base_vehicle bv
                 WHERE bv.modelSid = bvc.modelSid
                   AND bv.modelConfigSid = bvc.configurationItemsSid
@@ -644,13 +645,17 @@
             <if test="orgSid != null and orgSid != ''">
                 and bvc.useOrgSid = #{orgSid}
             </if>
-            and (SELECT count (*)
-                FROM base_vehicle bv
-                WHERE bv.modelSid = bvc.modelSid
+            AND (
+            SELECT
+            count(*)
+            FROM
+            base_vehicle bv
+            WHERE
+            bv.modelSid = bvc.modelSid
             AND bv.modelConfigSid = bvc.configurationItemsSid
             AND bv.lockedState = #{state}
-            and bv.useOrg = #{orgSid})
-              > 0
+            AND bv.useOrg = #{orgSid}
+            ) > 0
         </where>
 
 
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 b0c4a12133..7a190a63f3 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
@@ -580,12 +580,7 @@
             <if test="useOrgSid != null and useOrgSid != ''">
                 and bvc.useOrgSid = #{useOrgSid}
             </if>
-            and (SELECT count (*)
-                FROM base_vehicle bv
-                WHERE bv.modelSid = bvm.sid
-            AND bv.lockedState = #{state}
-            and bv.useOrg = #{useOrgSid})
-              >0
+            AND (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND bv.lockedState = #{state} AND bv.useOrg = #{useOrgSid} ) > 0
         </where>
     </select>