From fc56d8af3c6abd55fb46ba84cca1575948c7ed68 Mon Sep 17 00:00:00 2001
From: Kurisu <makise_kurisuu@outlook.jp>
Date: Wed, 4 Jan 2023 17:09:09 +0800
Subject: [PATCH] feature(*): 查询的bug修复

---
 fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml | 88 ++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml b/fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
index cc4fd3d..d35bfa0 100644
--- a/fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
+++ b/fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
@@ -168,61 +168,65 @@
         </if>
         <if test="condition.andCondition==true">
             and (
-            t1.adviser_id is not null
-            <if test="condition.minMileage !=null and condition.maxMileage !=null">
-                <if test="condition.minMileage !=null">
-                    and t1.current_mileage >= #{condition.minMileage}
+            t1.adviser_id is not null and
+            <trim prefixOverrides="and">
+                <if test="condition.minMileage !=null and condition.maxMileage !=null">
+                    <if test="condition.minMileage !=null">
+                        and t1.current_mileage >= #{condition.minMileage}
+                    </if>
+                    <if test="condition.maxMileage !=null">
+                        and t1.current_mileage &lt;= #{condition.maxMileage}
+                    </if>
                 </if>
-                <if test="condition.maxMileage !=null">
-                    and t1.current_mileage &lt;= #{condition.maxMileage}
-                </if>
-            </if>
 
-            <if test="condition.minBuyDate !=null and condition.maxBuyDate !=null">
-                <if test="condition.minBuyDate !=null">
-                    and t1.buy_date >= #{condition.minBuyDate}
+                <if test="condition.minBuyDate !=null and condition.maxBuyDate !=null">
+                    <if test="condition.minBuyDate !=null">
+                        and t1.buy_date >= #{condition.minBuyDate}
+                    </if>
+                    <if test="condition.maxBuyDate !=null">
+                        and t1.buy_date &lt;= #{condition.maxBuyDate}
+                    </if>
                 </if>
-                <if test="condition.maxBuyDate !=null">
-                    and t1.buy_date &lt;= #{condition.maxBuyDate}
-                </if>
-            </if>
 
-            <if test="condition.level !=null">
-                and t1.cus_level = #{condition.level}
-            </if>
+                <if test="condition.level !=null">
+                    and t1.cus_level = #{condition.level}
+                </if>
+            </trim>
             )
         </if>
 
         <if test="condition.andCondition==false">
             and (
-            t1.adviser_id is not null
-            <if test="condition.minMileage !=null and condition.maxMileage !=null">
-                or (
-                t1.current_mileage is not null
-                <if test="condition.minMileage !=null">
-                    and t1.current_mileage >= #{condition.minMileage}
-                </if>
-                <if test="condition.maxMileage !=null">
-                    and t1.current_mileage &lt;= #{condition.maxMileage}
+            t1.adviser_id is not null and
+            <trim prefixOverrides="or">
+                <if test="condition.minMileage !=null and condition.maxMileage !=null">
+                    or (
+                    t1.current_mileage is not null
+                    <if test="condition.minMileage !=null">
+                        and t1.current_mileage >= #{condition.minMileage}
+                    </if>
+                    <if test="condition.maxMileage !=null">
+                        and t1.current_mileage &lt;= #{condition.maxMileage}
+                    </if>
+                    )
                 </if>
-                )
-            </if>
 
-            <if test="condition.minBuyDate !=null and condition.maxBuyDate !=null">
-                or (
-                t1.buy_date is not null
-                <if test="condition.minBuyDate !=null">
-                    and t1.buy_date >= #{condition.minBuyDate}
-                </if>
-                <if test="condition.maxBuyDate !=null">
-                    and t1.buy_date &lt;= #{condition.maxBuyDate}
+                <if test="condition.minBuyDate !=null and condition.maxBuyDate !=null">
+                    or (
+                    t1.buy_date is not null
+                    <if test="condition.minBuyDate !=null">
+                        and t1.buy_date >= #{condition.minBuyDate}
+                    </if>
+                    <if test="condition.maxBuyDate !=null">
+                        and t1.buy_date &lt;= #{condition.maxBuyDate}
+                    </if>
+                    )
                 </if>
-                )
-            </if>
 
-            <if test="condition.level !=null">
-                or t1.cus_level = #{condition.level}
-            </if>
+                <if test="condition.level !=null">
+                    or t1.cus_level = #{condition.level}
+                </if>
+            </trim>
             )
         </if>
     </select>
--
libgit2 0.22.2