From e998c057be6d077dcec169ab4cb34f4755932601 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 13 八月 2025 15:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 576d920..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){
@@ -66,10 +66,10 @@
// driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
for (Map<String, Object> stringObjectMap : list) {
// 1使用中 2空闲中
- if(stringObjectMap.get("useDriverId").toString().equals(uid.toString())){
+ 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