yoho-search / yoho-search-service · Commits

Go to a project

Authored by 胡古飞
Commit 7d00e6c9e21f41777cdf7679a188c2b0eb6a679e 1 parent 7e94c262

添加状态判断

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -242,7 +242,7 @@ public class ShopListServiceImpl implements IShopListService { @@ -242,7 +242,7 @@ public class ShopListServiceImpl implements IShopListService {
242 Map<String, Object> shop_info = new HashMap<String, Object>(); 242 Map<String, Object> shop_info = new HashMap<String, Object>();
243 if ("Y".equals(isGlobal) && brandId != null) { 243 if ("Y".equals(isGlobal) && brandId != null) {
244 Map<String, Object> globalBrand = globalBrandMap.get(brandId); 244 Map<String, Object> globalBrand = globalBrandMap.get(brandId);
245 - if (globalBrand != null) { 245 + if (globalBrand != null && 1==(Integer)globalBrand.get("status")) {
246 shop_info.put("tbl_brand", globalBrand); 246 shop_info.put("tbl_brand", globalBrand);
247 shop_info.put("yoho_shop", null); 247 shop_info.put("yoho_shop", null);
248 shops_info.add(shop_info); 248 shops_info.add(shop_info);
@@ -250,7 +250,7 @@ public class ShopListServiceImpl implements IShopListService { @@ -250,7 +250,7 @@ public class ShopListServiceImpl implements IShopListService {
250 } 250 }
251 if ("N".equals(isGlobal) && shopId != null && Integer.valueOf(shopId) > 0) { 251 if ("N".equals(isGlobal) && shopId != null && Integer.valueOf(shopId) > 0) {
252 Map<String, Object> yohoShopInfo = yohoShopMap.get(shopId); 252 Map<String, Object> yohoShopInfo = yohoShopMap.get(shopId);
253 - if (yohoShopInfo != null) { 253 + if (yohoShopInfo != null && 1==(Integer)yohoShopInfo.get("status")) {
254 shop_info.put("tbl_brand", null); 254 shop_info.put("tbl_brand", null);
255 shop_info.put("yoho_shop", yohoShopInfo); 255 shop_info.put("yoho_shop", yohoShopInfo);
256 shops_info.add(shop_info); 256 shops_info.add(shop_info);