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 0a06d197a..797394d8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -643,9 +643,15 @@ public class WxShopServiceImpl implements WxShopService { @Override public Map> findMerchantShopVoListMap(TenantEntity tenantEntity, List merchantIds) { + Map> retMap = new HashMap>(); + Map floorMap = getFloorMap(tenantEntity); Map buildingMap = getBuildingMap(tenantEntity); List shopIds = wxMerchantShopMapper.findShopIds(merchantIds); + + if(shopIds == null || shopIds.isEmpty()){ + return retMap; + } List shopVoList = wxShopMapper.newFindShopVoList(tenantEntity.getTenantId(),shopIds); Map shopVoMap = new HashMap(); @@ -656,8 +662,7 @@ public class WxShopServiceImpl implements WxShopService { shopVoMap.put(sv.getId(), sv); } } - - Map> retMap = new HashMap>(); + WxMerchantShop merchantShopQ = new WxMerchantShop(); merchantShopQ.updateTenantInfo(tenantEntity); merchantShopQ.setMerchantIds(merchantIds);