From 1a8eba26a6a3116a59cf6bf58e0fb1570de12767 Mon Sep 17 00:00:00 2001
From: chenxiky <2868613334@qq.com>
Date: Sat, 26 Jul 2025 18:29:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E5=8F=91=E8=B5=B7=E8=80=85=E4=B8=BA?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E4=B9=8B=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/aircraft/modules/order/biz/OrderBiz.java  | 6 ++++++
 .../com/aircraft/modules/order/domain/dto/AddOrderDTO.java  | 5 +++--
 2 files changed, 9 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 4cd6991..d0677fd 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
@@ -552,6 +552,12 @@ public class OrderBiz {
      * @return  {@link List<OrderOperator>}
      */
     private List<OrderOperator> buildOrderOperatorParam(List<Long> operatorIds, Long orderId) {
+        // 获取当前登录人ID
+        Long currentOperatorId = SecurityUtils.getCurrentUserId();
+        // 如果操作人不包含在 operatorIds则添加当前登录人ID（默认添加任务发起者为操作人）
+        if (!operatorIds.contains(currentOperatorId)) {
+            operatorIds.add(currentOperatorId);
+        }
         List<OrderOperator> orderOperatorList = new ArrayList<>();
         for (Long operatorId : operatorIds) {
             OrderOperator orderOperator = new OrderOperator();
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderDTO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderDTO.java
index dc729f5..52f1776 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderDTO.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/AddOrderDTO.java
@@ -68,6 +68,7 @@ public class AddOrderDTO {
     /**
      * 额外费用
      */
+    @NotNull
     @ApiModelProperty(value = "额外费用", required = true)
     @DecimalMin(value = "0", message = "额外费用不能小于0")
     private BigDecimal surchargeAmount;
@@ -75,8 +76,8 @@ public class AddOrderDTO {
     /**
      * 操作人集合ID
      */
-    @NotNull(message = "操作人集合ID不能为空")
-    @NotEmpty
+    @NotNull
+    @NotEmpty(message = "操作人集合ID不能为空")
     @ApiModelProperty(value = "操作人集合ID", required = true)
     private List<Long> operatorIds;