订单

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,14 +85,16 @@ public class GicOrderController {
         logger.info("订单信息={}", JSON.toJSONString(ret, true));
         if (ret.isSuccess()) {
             Page<ListOrderDTO> page = ret.getResult();
-            List<ListOrderDTO> orderList = page.getResult();
             List<OrderListVO> voList = new ArrayList<>();
-            for (ListOrderDTO order : orderList) {
-                OrderListVO vo = EntityUtil.changeEntityNew(OrderListVO.class, order);
-                List<ListOrderItemDTO> itemList = order.getOrderItemDTOList();
-                List<OrderListItemVO> voItemList = EntityUtil.changeEntityListNew(OrderListItemVO.class, itemList);
-                vo.setOrderItemList(voItemList);
-                voList.add(vo);
+            if (CollectionUtils.isNotEmpty(page.getResult())) {
+                List<ListOrderDTO> orderList = page.getResult();
+                for (ListOrderDTO order : orderList) {
+                    OrderListVO vo = EntityUtil.changeEntityNew(OrderListVO.class, order);
+                    List<ListOrderItemDTO> itemList = order.getOrderItemDTOList();
+                    List<OrderListItemVO> voItemList = EntityUtil.changeEntityListNew(OrderListItemVO.class, itemList);
+                    vo.setOrderItemList(voItemList);
+                    voList.add(vo);
+                }
             }
             Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
             retPage.setResult(voList);