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/TCarController.java | 2 +-
1 files changed, 1 insertions(+), 1 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 bc1cae6..3b2e5b9 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
@@ -659,7 +659,7 @@
for (String s : split) {
TDriver tDriver = driverService.selectById(s);
DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", s).eq("state", 1));
- if(null != driverWork && !list.contains(s)){
+ if(!list.contains(s) && null != driverWork){
throw new RuntimeException(tDriver.getName() + "上班中，不能取消授权");
}
}
--
Gitblit v1.7.1