From c9e87de4530555b42149bec244da3a3dcaa7b92e Mon Sep 17 00:00:00 2001 From: xwb <717567226@qq.com> Date: Fri, 1 May 2020 23:00:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A2=E5=8D=95=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yixiang/modules/shop/rest/StoreOrderController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 +}