From 538fdd855253c3d1c2a8b130bf21b658f3b69ce9 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Sat, 13 Sep 2025 22:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BD=A6=E8=BE=86=E6=94=B9?=
 =?UTF-8?q?=E6=88=90or?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/CarModelMapper.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/CarModelMapper.xml b/src/main/resources/mapper/CarModelMapper.xml
index 2abda4a..80fc764 100644
--- a/src/main/resources/mapper/CarModelMapper.xml
+++ b/src/main/resources/mapper/CarModelMapper.xml
@@ -28,11 +28,20 @@
         zc_rent_car_rule r ON mp.car_rule_id = r.id AND r.del_flag = '0' AND r.status = '0'
         <where>
             s.id = #{storeCarModelReq.storeId}
-            <if test="storeCarModelReq.depositFree != null and storeCarModelReq.depositFree != ''">
-                AND r.deposit_free = #{storeCarModelReq.depositFree}
-            </if>
-            <if test="storeCarModelReq.autoDeduct != null and storeCarModelReq.autoDeduct != ''">
-                AND r.auto_deduct = #{storeCarModelReq.autoDeduct}
+            <if test="(storeCarModelReq.depositFree != null and storeCarModelReq.depositFree != '') or (storeCarModelReq.autoDeduct != null and storeCarModelReq.autoDeduct != '')">
+                AND (
+                <choose>
+                    <when test="storeCarModelReq.depositFree != null and storeCarModelReq.depositFree != '' and storeCarModelReq.autoDeduct != null and storeCarModelReq.autoDeduct != ''">
+                        r.deposit_free = #{storeCarModelReq.depositFree} OR r.auto_deduct = #{storeCarModelReq.autoDeduct}
+                    </when>
+                    <when test="storeCarModelReq.depositFree != null and storeCarModelReq.depositFree != ''">
+                        r.deposit_free = #{storeCarModelReq.depositFree}
+                    </when>
+                    <otherwise>
+                        r.auto_deduct = #{storeCarModelReq.autoDeduct}
+                    </otherwise>
+                </choose>
+                )
             </if>
             AND cm.del_flag = '0' AND cm.status = '0'
         </where>