From 18889c41864033d0a0d682a0d52c2d1fcf9fb47c Mon Sep 17 00:00:00 2001
From: chenxiky <2868613334@qq.com>
Date: Sat, 2 Aug 2025 14:43:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=99=90=E5=88=B6=E5=8F=96=E5=8F=8D?=
 =?UTF-8?q?=EF=BC=88=E5=BA=94=E6=98=AF&=E9=99=90=E5=88=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/aircraft/modules/order/biz/OrderBiz.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
index 9e9e0d0..23cca74 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
@@ -307,9 +307,9 @@ public class OrderBiz {
 
         // 订单处于完成/取消状态/待确认状态，不允许新增任务
         OrderMain orderMain = orderMainService.obtainOrderMainById(orderTaskDTO.getOrderId());
-        if (!Objects.equals(orderMain.getMainOrderStatus(), MainOrderStatusEnum.NOT_STARTED.getCode()) ||
+        if (!Objects.equals(orderMain.getMainOrderStatus(), MainOrderStatusEnum.NOT_STARTED.getCode()) &&
                 !Objects.equals(orderMain.getMainOrderStatus(), MainOrderStatusEnum.PROCESSING.getCode())) {
-            throw new BadRequestException("当前订单状态处于:"+ MainOrderStatusEnum.getInstance(orderMain.getMainOrderStatus()) + "，不允许新增任务");
+            throw new BadRequestException("当前订单状态处于:"+ MainOrderStatusEnum.getInstance(orderMain.getMainOrderStatus()).getDescription() + "，不允许新增任务");
         }
 
         // 新建订单飞行任务限制（当前飞行员不能存在任务处于未进行，进行中）