11

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -121,7 +121,7 @@ SELECT a.*,b.ClassName from rb_brand as a LEFT JOIN rb_brandclass as b on a.Bran
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
-            builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
+            //builder.AppendFormat(" AND b.{0}={1} ", nameof(RB_Brand_Extend.Status), (int)DateStateEnum.Normal);
             if (query == null)
             {
                 return new RB_Brand_Extend();

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2108,7 +2108,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             query.PaiYan = -1;
             query.Sewage = -1;
             var extModel = carrierModule.GetBrand(query);
-
+            if (extModel != null)
+            {
                 if (!string.IsNullOrWhiteSpace(extModel.Banner))
                 {
                     extModel.BannerList = JsonConvert.DeserializeObject<List<string>>(extModel.Banner);
@@ -2157,6 +2158,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.TongYiMobile = Config.TongYiPhone ?? "";
                 return ApiResult.Success(data: extModel);
             }
+            return ApiResult.Failed();
+        }
 
         /// <summary>
         /// 获取品牌分类列表