diff --git a/src/main/java/com/hotwj/platform/driverManagement/driver/service/impl/HotDriverServiceImpl.java b/src/main/java/com/hotwj/platform/driverManagement/driver/service/impl/HotDriverServiceImpl.java index 4599047..9335ad2 100644 --- a/src/main/java/com/hotwj/platform/driverManagement/driver/service/impl/HotDriverServiceImpl.java +++ b/src/main/java/com/hotwj/platform/driverManagement/driver/service/impl/HotDriverServiceImpl.java @@ -993,13 +993,11 @@ public class HotDriverServiceImpl implements IHotDriverService { if (StringUtils.equals(driver.getVehicleId(), targetVehicleId)) { return true; } - if (StringUtils.isBlank(driver.getVehicleId())) { - throw new ServiceException("当前默认车辆不存在,不能切换"); + if (StringUtils.isNotBlank(driver.getVehicleId())) { + hotVehicleThreeInspectService.validateNoUnfinishedSwitchVehicleProcess(driver.getVehicleId(), + "请先完成'" + StringUtils.defaultIfBlank(driver.getPlateNumber(), "当前车辆") + "'的车辆三检"); } - hotVehicleThreeInspectService.validateNoUnfinishedSwitchVehicleProcess(driver.getVehicleId(), - "请先完成'" + StringUtils.defaultIfBlank(driver.getPlateNumber(), "当前车辆") + "'的车辆三检"); - HotVehicle targetVehicle = vehicleMapper.selectOne(Wrappers.lambdaQuery() .eq(HotVehicle::getId, targetVehicleId) .eq(HotVehicle::getCompanyId, driver.getCompanyId())