提交修改

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java

@@ -135,8 +135,17 @@ public class AdminOrderController {
 
         // 获取子单
         List<VvTradeOrderLineEntity> vvTradeOrderLineEntities = pageUtils.getRows();
+        /***
+         * 如果没有数据，就直接返回吧
+         */
+        if(CollectionUtils.isEmpty(vvTradeOrderLineEntities)){
+            return R.ok().setData(pageUtils);
+        }
+
         // 获取订单
+
         List<Long> tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId);
+
         List<VvTradeOrderEntity> tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds);
         // 对订单进行排序，必须按照子单的顺序
         Map<Long, VvTradeOrderEntity> vvTradeOrderEntityMap = SanUtils.groupByFiled2Map(tradeOrderEntities, VvTradeOrderEntity::getId);