diff --git a/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 2e820d91..4f6ccd49 100644 --- a/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -119,8 +119,10 @@ namespace BBWY.Server.Business public IList GetPurchaseSchemeList(QuerySchemeRequest querySchemeRequest) { var purchaseSchemeList = fsql.Select().InnerJoin((ps, p) => ps.PurchaserId == p.Id) - .Where((ps, p) => querySchemeRequest.ProductIdList.Contains(ps.ProductId) && ps.ShopId == querySchemeRequest.ShopId) + .Where((ps, p) => ps.ShopId == querySchemeRequest.ShopId) + .WhereIf(querySchemeRequest.ProductIdList != null && querySchemeRequest.ProductIdList.Count() > 0, (ps, p) => querySchemeRequest.ProductIdList.Contains(ps.ProductId)) .WhereIf(!string.IsNullOrEmpty(querySchemeRequest.PurchaserId), (ps, p) => ps.PurchaserId == querySchemeRequest.PurchaserId) + .WhereIf(!string.IsNullOrEmpty(querySchemeRequest.SkuId), (ps, p) => ps.SkuId == querySchemeRequest.SkuId) .ToList((ps, p) => new PurchaseSchemeResponse() { Id = ps.Id, diff --git a/BBWY.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs index d9e079a5..c8c84ea0 100644 --- a/BBWY.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs +++ b/BBWY.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs @@ -14,5 +14,7 @@ namespace BBWY.Server.Model.Dto /// 采购商Id, 可空 /// public string PurchaserId { get; set; } + + public string SkuId { get; set; } } }