Merge remote-tracking branch 'origin/dev' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -176,7 +176,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
-        if(vehicleBookRecordQueryVo.getStatus() == 2) {
+        if(vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 2) {
             Query query2 = new Query(vehicleBookRecordQueryVo);
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query2.getSuper());
             removeStatus2(list);