From 2eff47cee650f624b4fb61fb6f073e1e521b8082 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 22 一月 2026 20:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index e6d8788..0aa7132 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -888,12 +888,12 @@
TDriver tDriver = tDriverService.selectById(tDriverId);
DriverWork driverWork = iDriverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", tDriverId).eq("state", 1));
if(null != driverWork && !tDriver.getCarId().equals(carId)){
- throw new RuntimeException("司机上班中，不能更换车辆");
+ return ResultUtil.error("司机上班中，不能更换车辆");
}
tDriver.setCarId(carId);
tDriverService.updateById(tDriver);
}
- return SUCCESS_TIP;
+ return ResultUtil.success();
}
/**
--
Gitblit v1.7.1