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 df95210f2..2288bab98 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1333,7 +1333,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public List getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel,String shopNumber ) { - if (null != floorRule || null != building || null != floor) { + if (null != floorRule || null != building || null != floor || StringUtils.isNotBlank(shopNumber)) { List merchantIds = new ArrayList(); WxShop shopQ = new WxShop(); if (null != shopDel) { @@ -1352,7 +1352,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (null != shopTypeForRule) { shopQ.setShopTypeForRule(shopTypeForRule); } - shopQ.setShopNumber(shopNumber); + if (StringUtils.isNotBlank(shopNumber)) { + shopQ.setShopNumber(shopNumber); + } + List shopIds = wxShopMapper.findIdList(shopQ); List shopNumberList = wxShopMapper.findShopNumberList(shopQ); if (null == shopIds || shopIds.size() <= 0) {