Merge branch 'master-vehicle-memeber' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -189,12 +189,12 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
             dto.setEndCompanyId(dto.getEndCompanyId());
             //查询可车辆信息
             PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
-            if (pageDataVO.getData().size() <= 0 && dto.getMemberUse().equals(VehicleMemberType.NO.getCode())) {
+            if (pageDataVO.getData().size() <= 0 && (dto.getMemberUse() == null || dto.getMemberUse().equals(VehicleMemberType.NO.getCode()))) {
 
                 throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{
                     add("可用车辆不存在");
                 }});
-            } else  if (pageDataVO.getData().size() <= 0 && !dto.getMemberUse().equals(VehicleMemberType.NO.getCode())) {
+            } else  if (pageDataVO.getData().size() <= 0 && (dto.getMemberUse() == null ||!dto.getMemberUse().equals(VehicleMemberType.NO.getCode()))) {
                 throw new BaseException(ResultCode.NOTEXIST_CODE, new HashSet<String>(){{
                     add("该车不能使用会员免费天数");
                 }});