diff --git a/fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml b/fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
index d35bfa0..11e7e13 100644
--- a/fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
+++ b/fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
@@ -264,60 +264,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}
-                </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}
+            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.maxBuyDate !=null">
-                    and t1.buy_date &lt;= #{condition.maxBuyDate}
+
+                <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>
 
-            <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>