修改bug

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

@@ -584,10 +584,6 @@
             left join vehicle_cata vc on vm.id = vc.vehicle_model_id
         </if>
         <where>
-            <!-- 若需根据预定日期条件查询，针对换为位操作  -->
-                <!-- yearNo4Where 标识时间参数是否用于where条件 -->
-            (abr.to_lift_company = null or (abr.to_lift_company = ))
-
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test=" yearMonthAndParam !=null and yearNo4Where == null">
@@ -596,6 +592,9 @@
                     <include refid="yearMonthAndParamSql"></include>
                 </foreach>
             </if>
+
+            <!-- 若需根据预定日期条件查询，针对换为位操作  -->
+                <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test="startCompanyId != null and endCompanyId != null ">
                 and (
                     (abr.to_lift_company = null or abr.to_lift_company = #{startCompanyId})
@@ -638,7 +637,7 @@
         left join vehicle_book_record vbre
         on sevbr.vehicle_id = vbre.vehicle_id and sevbr.max_book_end_date = vbre.book_end_date and vbre.status != 4 and vbre.status != 6
         left join vehicle_book_record vbrs
-        on sevbr.vehicle_id = vbrs.vehicle_id and sevbr.min_book_start_date = vbrs.book_start_date and vbrs.status != 4 and vbrs.status != 6;
+        on sevbr.vehicle_id = vbrs.vehicle_id and sevbr.min_book_start_date = vbrs.book_start_date and vbrs.status != 4 and vbrs.status != 6
     </sql>
 
 </mapper>
\ No newline at end of file