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