修改租车列表显示bug

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java

@@ -54,8 +54,8 @@ public class UsableVeicleDTO extends PageParam {
         @ApiModelProperty(hidden = true)
         Boolean yearNo4Where;
 
-//        @ApiModelProperty(hidden = true)
-//        Integer withoutRecordWhere = 1;
+        @ApiModelProperty(hidden = true)
+        Integer withoutRecordWhere = 1;
 
         public void setStartDateTamp(Long startDateTamp) {
             this.startDateTamp = startDateTamp;

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

@@ -528,13 +528,10 @@
                 </foreach>
                 <!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 hasVehicle-->
                 <if test="withoutRecordWhere != null and withoutRecordWhere = 1 and startCompanyId != null and endCompanyId != null ">
-                    and if((
-                    (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
-                    and
-                    (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
-                    ) = true, 1, 0)
+                    and (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
+                    and (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
                 </if>
-            )
+                )
             )as hasVehicle
         </if>
         <if test="lon != null and lat != null">
@@ -597,8 +594,7 @@
             <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
                 hasVehicle desc,
             </if>
-            distance asc,
-            model_id asc
+            distance asc, model_id asc
         </if>
     </select>