From f54c314e93384ea3dc0d2045a03f57dd90f2d8f2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 9 Apr 2019 15:14:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 ef450c453..2c86cfa83 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -81,12 +81,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { - - WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setTenantId(record.getTenantId()); List list = wxRentContractMapper.findList(wxRentContract); - PageHelper.startPage(pageIndex, pageSize); List merchants = wxMerchantMapper.findList(record); for (WxMerchant merchant : merchants) { @@ -99,14 +96,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); } if (record.getRentShopType() != null) { + List> shops = new ArrayList<>(); WxMerchantShop wxMerchantShop = new WxMerchantShop(); wxMerchantShop.setMerchantId(merchant.getId()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - List> shops = new ArrayList<>(); List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); for (WxMerchantShop merchantShop : wxMerchantShopList) { WxShop shop = new WxShop(); - record.setId(merchantShop.getShopId()); + shop.setId(merchantShop.getShopId()); List> shoplist = wxShopMapper.findListMap(shop); if (shoplist.size() > 0) { shops.add(shoplist.get(0)); @@ -115,7 +112,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchant.setShoplist(shops); } } - PageInfo pageInfo = new PageInfo<>(merchants); return pageInfo; }