From 99abed00889932cd7415502fda5371617eaef98e Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Sat, 22 Nov 2025 23:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/heyu/api/controller/mm/AdminOrderController.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index 3979dc0..c0a1ac2 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java @@ -135,8 +135,17 @@ public class AdminOrderController { // 获取子单 List vvTradeOrderLineEntities = pageUtils.getRows(); + /*** + * 如果没有数据，就直接返回吧 + */ + if(CollectionUtils.isEmpty(vvTradeOrderLineEntities)){ + return R.ok().setData(pageUtils); + } + // 获取订单 + List tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId); + List tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds); // 对订单进行排序，必须按照子单的顺序 Map vvTradeOrderEntityMap = SanUtils.groupByFiled2Map(tradeOrderEntities, VvTradeOrderEntity::getId);