From 81ccbc40bcf34c330b9f1ef0418a503da65787fa Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Mon, 10 Jul 2023 22:39:21 +0800
Subject: [PATCH] fix

---
 .../main/java/com/ghy/web/controller/order/OrderController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 08c7c2ab..79388fd0 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -382,9 +382,9 @@ public class OrderController extends BaseController {
 
         // 更新主订单
         OrderMaster om2up = new OrderMaster();
+        om2up.setId(om.getId());
         // 判断是否全部派完
         if (orderMasterService.isAllAssign(om.getId())) {
-            om2up.setId(om.getId());
             Set<Long> workIds = orderDetailService.selectByOrderMasterId(om.getId()).stream().map(OrderDetail::getWorkerId).collect(Collectors.toSet());
             if (workIds.size() == 1 && workIds.contains(om.getWorkerId())) {
                 // 派完单 并且只有自己接单