From 537c63c06fb2c394377d8be0d321bce274bbd882 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 9 Oct 2018 12:53:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=A4=E6=96=AD=E5=8A=A0=E8=8A=B1?= =?UTF-8?q?=E6=8B=AC=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 9d510a09a..1017d1d36 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -69,6 +69,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); } } + PageInfo pageInfo = new PageInfo<>(merchants); return pageInfo; } @@ -103,8 +104,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxShop record = new WxShop(); record.setId(merchantShop.getShopId()); List> shoplist = wxShopMapper.findListMap(record); - if(shoplist.size()>0) + if(shoplist.size()>0) { shops.add(shoplist.get(0)); + } } wxMerchant.setShoplist(shops);