From 8399270e3f12301ddf143c87bec9ca1be7b54ff0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 11:05:18 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
index d926cbf..504508c 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -14,7 +14,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
import java.util.*;
@@ -52,6 +51,7 @@
Integer carId = driver.getCarId();
map.put("car", "");
+ map.put("id", carId);
if(carId!=null){
Car car = carMapper.selectById(carId);
if(car.getCarLicensePlate()!=null){
@@ -69,7 +69,7 @@
if(stringObjectMap.get("useDriverId")!=null && stringObjectMap.get("useDriverId").toString().equals(uid.toString())){
map.put("useState", 1);
}else {
- map.put("useState", 0);
+ map.put("useState", 2);
}
}
map.put("list", list);
@@ -163,7 +163,7 @@
@Override
public boolean useState(Integer carId, Integer uid) {
Car car = carMapper.selectById(carId);
- if(car.getUseDriverId()!=null || !car.getUseDriverId().equals(uid)){
+ if(car.getUseDriverId()!=null && !car.getUseDriverId().equals(uid)){
return false;
}
return true;
--
Gitblit v1.7.1