diff --git a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs index bb7412f..fcc59ff 100644 --- a/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs +++ b/BBWYB.Server.API/Controllers/PurchaseSchemeController.cs @@ -56,7 +56,7 @@ namespace BBWYB.Server.API.Controllers [HttpPost] public IList GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request) { - return purchaseSchemeBusiness.GetPurchaseSchemeAndGroupList(request); + return purchaseSchemeBusiness.GetPurchaseSchemeAndGroupList(request, GetUserId()); } /// diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 85f0728..20f72fb 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -952,11 +952,13 @@ namespace BBWYB.Server.Business return purchaseSchemeList; } - public IList GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request) + public IList GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request, string userId) { + var user = userBusiness.GetisBargainTeamByUserId(userId); var purchaseSchemeGroupsList = fsql.Select() .Where(psg => psg.ShopId == request.ShopId && request.ProductIdList.Contains(psg.ProductId)) + .WhereIf(user.isBargainTeam, psg => psg.BelongBargainTeamId == user.department.Id) .ToList(); if (purchaseSchemeGroupsList.Count() > 0) { diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs index 2feb4c3..29ee702 100644 --- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs @@ -541,7 +541,7 @@ namespace BBWYB.Server.Business public ListResponse GetNoCompletionSkuOptimizationTask(QueryNoCompletionOptimizationTaskRequest request, string userId) { request.EndTime = request.EndTime.Date.AddDays(1).AddSeconds(-1); - var uInfo = userBusiness.GetisBargainTeamByUserId(userId, true); + var uInfo = userBusiness.GetisBargainTeamByUserId(userId); ISelect select = null; if (request.SpuOptimizationTaskId != null && request.SpuOptimizationTaskId != 0) diff --git a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs index 035efd9..17229eb 100644 --- a/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs +++ b/BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs @@ -7,39 +7,44 @@ namespace BBWYB.Server.Model.Db /// 采购方案分组表 /// [Table(Name = "purchaseschemegroup", DisableSyncStructure = true)] - public partial class PurchaseSchemeGroup + public partial class PurchaseSchemeGroup { - /// - /// 分组Id - /// - [Column(DbType = "bigint", IsPrimary = true)] - public long Id { get; set; } - - /// - /// 创建时间 - /// - [Column(DbType = "datetime")] - public DateTime? CreateTime { get; set; } - - /// - /// 组名 - /// - [Column(StringLength = 100)] - public string GroupName { get; set; } - - /// - /// 店铺spu,店铺商品Id - /// - [Column(StringLength = 50)] - public string ProductId { get; set; } - - /// - /// 店铺Id - /// - [Column(DbType = "bigint")] - public long? ShopId { get; set; } - - } + /// + /// 分组Id + /// + [Column(DbType = "bigint", IsPrimary = true)] + public long Id { get; set; } + + /// + /// 创建时间 + /// + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 组名 + /// + [Column(StringLength = 100)] + public string GroupName { get; set; } + + /// + /// 店铺spu,店铺商品Id + /// + [Column(StringLength = 50)] + public string ProductId { get; set; } + + /// + /// 店铺Id + /// + [Column(DbType = "bigint")] + public long? ShopId { get; set; } + + /// + /// 归属议价组 + /// + [Column(StringLength = 50)] + public string BelongBargainTeamId { get; set; } + } }