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 20376b7a5..5eb3ac0fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1011,7 +1011,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { Long floor = record.getFloor(); List floorMerchantIds = getFloorBuildMerchantIds(record, floorRule, building, floor, 0, 0); if (null != floorMerchantIds) { - merchantIds.retainAll(floorMerchantIds); + if(merchantIds.size() > 0){ + merchantIds.retainAll(floorMerchantIds); + }else{ + merchantIds.addAll(floorMerchantIds); + } } if (merchantIds.size() > 0 ) { record.setIds(merchantIds); @@ -1065,6 +1069,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { floorMerchantIds.add(-999L); return floorMerchantIds; } + return floorMerchantIds; } return null; }