Commit 36b35256 authored by 吴春's avatar 吴春

11

parent 0647b067
...@@ -1478,6 +1478,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -1478,6 +1478,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
query.OrderBy = 1;
var list = carrierModule.GetCarrierPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true); var list = carrierModule.GetCarrierPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query, true);
pageModel.count = Convert.ToInt32(rowsCount); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list.Select(x => new pageModel.pageData = list.Select(x => new
...@@ -2123,10 +2124,6 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -2123,10 +2124,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
return ApiResult.Failed("请上传Logo"); return ApiResult.Failed("请上传Logo");
} }
if (query.BrandClassId == 0)
{
return ApiResult.Failed("请选择品牌分类");
}
if (query.BannerList != null && query.BannerList.Any()) if (query.BannerList != null && query.BannerList.Any())
{ {
query.Banner = JsonConvert.SerializeObject(query.BannerList); query.Banner = JsonConvert.SerializeObject(query.BannerList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment