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);