From 352ed0e639c084e257914bcd8b78169f09e51985 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 28 二月 2026 21:29:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index b5beb30..a2c93d9 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -766,7 +766,7 @@
                             continue;
                         }
                         XpVehicle vehiclePosition = vehiclePositionR.getData();
-                        if (vehiclePosition.getStatus() != 1 || vehiclePosition.getState() != 0) {
+                        if (vehiclePosition.getStatus() != 1 || vehiclePosition.getState() != 0 || vehiclePosition.getVehicleType()==1) {
                             lock.unlock();
                             continue;
                         }
@@ -803,7 +803,7 @@
                             continue;
                         }
                         XpVehicle vehicleId1 = vehicleR.getData();
-                        if (vehicleId1.getStatus() != 1 || vehicleId1.getState() != 0) {
+                        if (vehicleId1.getStatus() != 1 || vehicleId1.getState() != 0 || vehicleId1.getVehicleType()==1) {
                             lock.unlock();
                             continue;
                         }

--
Gitblit v1.7.1