From 48cf970caaacffd18f7ea03737f0ed187e54f216 Mon Sep 17 00:00:00 2001
From: 18980591175 <470162950@qq.com>
Date: Wed, 20 May 2026 09:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=BA=E5=8F=AF=E5=A4=9A=E8=BD=A6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=80=E8=BD=A6=E5=8F=AA=E8=83=BD=E6=8C=82=E4=B8=80?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vehicleManagement/service/impl/HotVehicleServiceImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java b/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java
index e10e1a4..bb69a1c 100644
--- a/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java
+++ b/src/main/java/com/hotwj/platform/resourceManagement/vehicleManagement/service/impl/HotVehicleServiceImpl.java
@@ -343,7 +343,9 @@ public class HotVehicleServiceImpl implements IHotVehicleService {
         lqw.eq(bo.getIsTrailer() != null, HotVehicle::getIsTrailer, bo.getIsTrailer());
         lqw.eq(bo.getVehicleStatus() != null, HotVehicle::getVehicleStatus, bo.getVehicleStatus());
         lqw.in(HotVehicle::getOperationStatus, Arrays.asList(bo.getOperationStatus().split(",")));
-        lqw.eq(StringUtils.isNotBlank(bo.getCurrentDriver()), HotVehicle::getCurrentDriver, bo.getCurrentDriver());
+        lqw.and(wrapper -> wrapper.isNull(HotVehicle::getCurrentDriver)
+                .or()
+                .eq(HotVehicle::getCurrentDriver, ""));
         lqw.eq(StringUtils.isNotBlank(bo.getBodyImageUrls()), HotVehicle::getBodyImageUrls, bo.getBodyImageUrls());
         lqw.eq(StringUtils.isNotBlank(bo.getOtherAttachmentUrls()), HotVehicle::getOtherAttachmentUrls, bo.getOtherAttachmentUrls());
         lqw.eq(StringUtils.isNotBlank(bo.getColor()), HotVehicle::getColor, bo.getColor());