修改采购方案查询

BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs

@@ -119,8 +119,10 @@ namespace BBWY.Server.Business
         public IList<PurchaseSchemeResponse> GetPurchaseSchemeList(QuerySchemeRequest querySchemeRequest)
         {
             var purchaseSchemeList = fsql.Select<PurchaseScheme, Purchaser>().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,

BBWY.Server.Model/Dto/Request/PurchaseScheme/QuerySchemeRequest.cs

@@ -14,5 +14,7 @@ namespace BBWY.Server.Model.Dto
         /// 采购商Id, 可空
         /// </summary>
         public string PurchaserId { get; set; }
+
+        public string SkuId { get; set; }
     }
 }