From be3311daee5b05210b3a5fa48ab8e89bb2b90d1c Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Thu, 8 May 2025 17:39:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=90=E5=8D=95=E6=92=A4?= =?UTF-8?q?=E5=8D=95=E5=90=8E=E7=9A=84=20=20=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=9C=89=E5=AD=90=E5=8D=95=E8=BF=98=E5=9C=A8=E6=B4=BE?= =?UTF-8?q?=E5=8D=95=20=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=86=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderDetailController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index ab21d94d..4b63d76d 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -1191,7 +1191,7 @@ public class OrderDetailController extends BaseController { orderMaster2Update.setOrderStatus(OrderStatus.PLAIN.code()); // 查询是否还有派单记录,没有的话需要重置主单是否自己承接的字段为NULL List existOrderGoods = orderGoodsService.selectByOrderMasterId(od.getOrderMasterId()); - if (CollectionUtils.isNotEmpty(existOrderGoods)) { + if (CollectionUtils.isEmpty(existOrderGoods)) { orderMaster2Update.setResetAllSelfAssigned(true); } // 更新主单是否全部派完