添加状态判断

@@ -242,7 +242,7 @@ public class ShopListServiceImpl implements IShopListService {
 			Map<String, Object> shop_info = new HashMap<String, Object>();
 			if ("Y".equals(isGlobal) && brandId != null) {
 				Map<String, Object> globalBrand = globalBrandMap.get(brandId);
-				if (globalBrand != null) {
+				if (globalBrand != null && 1==(Integer)globalBrand.get("status")) {
 					shop_info.put("tbl_brand", globalBrand);
 					shop_info.put("yoho_shop", null);
 					shops_info.add(shop_info);
@@ -250,7 +250,7 @@ public class ShopListServiceImpl implements IShopListService {
 			}
 			if ("N".equals(isGlobal) && shopId != null && Integer.valueOf(shopId) > 0) {
 				Map<String, Object> yohoShopInfo = yohoShopMap.get(shopId);
-				if (yohoShopInfo != null) {
+				if (yohoShopInfo != null && 1==(Integer)yohoShopInfo.get("status")) {
 					shop_info.put("tbl_brand", null);
 					shop_info.put("yoho_shop", yohoShopInfo);
 					shops_info.add(shop_info);