From ceccb40cd7c3351b1d2e84d6cee3b2f90fed9c13 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Sun, 25 Oct 2026 19:45:41 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=8F=B8=E6=9C=BA=E4=B8=8E?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8C=89?=
 =?UTF-8?q?=E6=9C=AA=E5=88=86=E9=85=8D=E7=BB=84=E7=BB=87=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/transport/mapper/DriverMapper.xml   | 13 +++++++++++--
 .../transport/mapper/TransportVehicleMapper.xml     | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml
index 89e87067..7862dd68 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml
@@ -170,8 +170,17 @@
             AND driver_type = #{driver.driverType}
         </if>
         <if test="driver.organizationName != null and driver.organizationName != ''">
-            <bind name="organizationNameLike" value="'%' + driver.organizationName + '%'"/>
-            AND organization_name LIKE #{organizationNameLike}
+            <!-- 哨兵值来自前端 tms-erp-web/src/mixins/organization-search.js 的 UNASSIGNED_ORG_FILTER；
+                 改这里必须同步该常量与 TransportVehicleMapper.xml 的同名分支 -->
+            <choose>
+                <when test="'__UNASSIGNED_ORG__'.equals(driver.organizationName)">
+                    AND (organization_name IS NULL OR organization_name = '')
+                </when>
+                <otherwise>
+                    <bind name="organizationNameLike" value="'%' + driver.organizationName + '%'"/>
+                    AND organization_name LIKE #{organizationNameLike}
+                </otherwise>
+            </choose>
         </if>
         <if test="driver.status != null">
             AND status = #{driver.status}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml
index 0faafb78..81988d95 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml
@@ -117,8 +117,17 @@
     <sql id="QueryCondition">
         is_deleted = 0
         <if test="vehicle.organizationName != null and vehicle.organizationName != ''">
-            <bind name="organizationNameLike" value="'%' + vehicle.organizationName + '%'"/>
-            AND organization_name LIKE #{organizationNameLike}
+            <!-- 哨兵值来自前端 tms-erp-web/src/mixins/organization-search.js 的 UNASSIGNED_ORG_FILTER；
+                 改这里必须同步该常量与 DriverMapper.xml 的同名分支 -->
+            <choose>
+                <when test="'__UNASSIGNED_ORG__'.equals(vehicle.organizationName)">
+                    AND (organization_name IS NULL OR organization_name = '')
+                </when>
+                <otherwise>
+                    <bind name="organizationNameLike" value="'%' + vehicle.organizationName + '%'"/>
+                    AND organization_name LIKE #{organizationNameLike}
+                </otherwise>
+            </choose>
         </if>
         <if test="vehicle.useDepartment != null and vehicle.useDepartment != ''">
             <bind name="useDepartmentLike" value="'%' + vehicle.useDepartment + '%'"/>