From bb4f3de1d2b1ca33238e79ed31bb26504ab4b5b0 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 30 一月 2026 11:08:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index 6492c7b..da5101b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -712,7 +712,7 @@
TDriver tDriver = driverService.selectById(s);
DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", s).eq("state", 1));
if(!list.contains(s) && null != driverWork){
- throw new RuntimeException(tDriver.getName() + "上班中，不能取消授权");
+ return ResultUtil.error(tDriver.getName() + "上班中，不能取消授权");
}
}
}
@@ -766,7 +766,7 @@
}
}
}).start();
- return SUCCESS_TIP;
+ return ResultUtil.success();
}
@@ -781,7 +781,7 @@
for (TDriver tDriver : tDrivers) {
DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", tDriver.getId()).eq("state", 1));
if(null != driverWork){
- return new ErrorTip(500, tDriver.getName() + "司机正在上班中，不能取消授权");
+ return ResultUtil.error(tDriver.getName() + "司机正在上班中，不能取消授权");
}else{
tDriver.setCarId(null);
driverService.updateAllColumnById(tDriver);
@@ -789,7 +789,7 @@
}
obj.setBindDriverId(bindDriverId);
tCarService.updateById(obj);
- return SUCCESS_TIP;
+ return ResultUtil.success();
}
/**
--
Gitblit v1.7.1