From 7690223abcc6800702a07aca31f3bb87ffd233ce Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Mon, 27 May 2024 20:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml   | 2 +-
 .../zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml
index a92af04ad..b7bb8bb79 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml
@@ -19,7 +19,7 @@
         <if test="param.isBlack != null and param.isBlack != ''">
             and t.is_black=#{param.isBlack}
         </if>
-        <if test="param.carModuleType != null and param.carModuleType != ''">
+        <if test="param.carModuleType != null and param.carModuleType != '' and param.carModuleType != '4'.toString()">
             and t.car_module_type = #{param.carModuleType}
         </if>
         <if test="param.enterpriseIds != null and param.enterpriseIds.size() != 0">
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
index 2c6cf1860..7a1919e5b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
@@ -21,7 +21,8 @@
         ORDER BY a.pass_time DESC
     </select>
     <select id="getCarPassRecordList" resultType="com.zhgd.xmgl.modules.car.entity.CarPassRecord">
-        SELECT a.*, b.is_black
+        SELECT a.*, b.is_black,
+        ifnull(b.car_module_type,4) as carModuleType
         FROM car_pass_record a
         LEFT JOIN car_info b ON (a.project_sn = b.project_sn AND a.car_number = b.car_number)
         WHERE a.project_sn = #{projectSn}
@@ -167,7 +168,7 @@
         left join (<include refid="com.zhgd.xmgl.modules.car.mapper.CarInfoMapper.all"/>) as b ON (t.project_sn =
         b.project_sn AND t.car_number = b.car_number)
         where t.project_sn = #{param.projectSn}
-        <if test="param.carModuleType != null and param.carModuleType != ''">
+        <if test="param.carModuleType != null and param.carModuleType != '' and param.carModuleType != '4'.toString()">
             and b.car_module_type = #{param.carModuleType}
         </if>
         <if test="param.carModuleType == '4'.toString()">