新增押金记录，修改租车核销

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -377,22 +377,22 @@
         select v1.* from vehicle_book_record v1
         left join vehicle v2 on v2.id = v1.vehicle_id
         <where>
-            <if test="startTime != null">
-                and v1.create_time between #{startTime} and #{endTime}
-            </if>
-            <if test="numberPlate != null">
-                and v2.number_plate = #{numberPlate}
-            </if>
-            <if test="status != null">
-                and v2.status = #{status}
-            </if>
-            <if test="subordinateBranch != null">
-                and v2.subordinate_branch = #{subordinateBranch}
-            </if>
-            <if test="parkBranchCompanyId != null">
-                and v2.park_branch_company_id = #{parkBranchCompanyId}
-            </if>
-        </where>
+        <if test="startTime != null">
+            and v1.create_time between #{startTime} and #{endTime}
+        </if>
+        <if test="numberPlate != null || numberPlate != ''">
+            and v2.number_plate = #{numberPlate}
+        </if>
+        <if test="status != null">
+            and v2.status = #{status}
+        </if>
+        <if test="subordinateBranch != null">
+            and v2.subordinate_branch = #{subordinateBranch}
+        </if>
+        <if test="parkBranchCompanyId != null">
+            and v2.park_branch_company_id = #{parkBranchCompanyId}
+        </if>
+    </where>
         order By v1.create_time DESC
     </select>