diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java index 671612b9..5053b0d1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java @@ -389,11 +389,11 @@ public class StoreOrderController { @RequestParam(name = "orderType") String orderType, @RequestParam(name = "listContent") String listContent) throws IOException, ParseException { List list = (List)getYxStoreList(criteria, pageable, orderStatus, orderType).get("content"); - List idList = JSONArray.parseArray(listContent).toJavaList(String.class); - List yxStoreOrderDTOS = new ArrayList<>(); if(StringUtils.isEmpty(listContent)){ yxStoreOrderService.download(list, response); }else { + List idList = JSONArray.parseArray(listContent).toJavaList(String.class); + List yxStoreOrderDTOS = new ArrayList<>(); for(YxStoreOrderDTO yx : list){ for(String ids : idList){ if(yx.getOrderId().equals(ids)){ @@ -484,4 +484,4 @@ public class StoreOrderController { } -} \ No newline at end of file +}