From ab564273ec5349d3dd3f71049a4c2738f8b9ebc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 18:56:54 +0800
Subject: [PATCH] 修改bug

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 826b31a..9e470c0 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -932,14 +932,20 @@
         if(driver.getState() == 3){
             return ResultUtil.error("还在服务中,不能更换");
         }
-//        boolean idle = carService.idle(carId);
         // 修改是否别司机在使用
         boolean idle = carService.useState(carId,uid);
-        if(!idle){
+        if(idle){
             return ResultUtil.error("当前车辆已经有其他司机在使用,请更换车辆");
         }
-        // 将所有绑定他的车 =null
-        carService.updateUseState(carId,uid);
+        List<Driver> drivers = this.selectList(new EntityWrapper<Driver>().eq("carId", carId)
+                .eq("authState", 2).ne("flag", 3));
+        drivers.forEach(d->{
+            d.setCarId(null);
+        });
+        if(drivers.size() > 0){
+            this.updateAllColumnBatchById(drivers);
+        }
+
         Car car = carService.selectById(carId);
         car.setUseDriverId(uid);
         carService.updateById( car);

--
Gitblit v1.7.1