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 4b63d76d..45b1ab6c 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.isEmpty(existOrderGoods)) { + if (CollectionUtils.isNotEmpty(existOrderGoods)&&existOrderGoods.size()==1) { orderMaster2Update.setResetAllSelfAssigned(true); } // 更新主单是否全部派完