From 93f32048514a27b09b67eaa3901ccc037898663a Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 8 Feb 2022 00:54:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs | 4 +++- .../Dto/Request/PurchaseScheme/QuerySchemeRequest.cs | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) 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; } } }