From 6345eded33a5984385bf5e6223347c722769b6a1 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Thu, 21 Nov 2024 21:01:39 +0800 Subject: [PATCH] fix --- .../service/impl/WxShopServiceImpl.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index c3501392a..e9422c7c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -132,25 +132,26 @@ public class WxShopServiceImpl implements WxShopService { suq.setShopIds(shopIdList); suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); Map shopUserMap = this.getShopUserMap(suq); - if (null != shopUserMap) { - for (int i = 0 ; i < page.getList().size(); i ++) { - WxShop shop = page.getList().get(i); + + for (int i = 0 ; i < page.getList().size(); i ++) { + WxShop shop = page.getList().get(i); + if (null != shopUserMap) { WxShopUsers su = shopUserMap.get(shop.getId()); if (null != su) { shop.setShopUserType(su.getType()); shop.setShopUserTypeName(su.getTypeName()); shop.setShopUserName(su.getName()); } - if (null != buildingMap) { - String buildingName = buildingMap.get(shop.getBuilding()); - shop.setBuildingName(buildingName); - } - if (null != floorMap) { - String floorName = floorMap.get(shop.getFloor()); - shop.setFloorName(floorName); - } - } - } + } + if (null != buildingMap) { + String buildingName = buildingMap.get(shop.getBuilding()); + shop.setBuildingName(buildingName); + } + if (null != floorMap) { + String floorName = floorMap.get(shop.getFloor()); + shop.setFloorName(floorName); + } + } } return page; }