允许非议价组查询spu任务 但不允许完成优化和更新报价

查询采购方案分组接口，如果是议价组查询只返回跟当前议价组有关的分组

BBWYB.Server.API/Controllers/PurchaseSchemeController.cs

@@ -56,7 +56,7 @@ namespace BBWYB.Server.API.Controllers
         [HttpPost]
         public IList<PurchaseSchemeGroupResponse> GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request)
         {
-            return purchaseSchemeBusiness.GetPurchaseSchemeAndGroupList(request);
+            return purchaseSchemeBusiness.GetPurchaseSchemeAndGroupList(request, GetUserId());
         }
 
         /// <summary>

BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs

@@ -952,11 +952,13 @@ namespace BBWYB.Server.Business
             return purchaseSchemeList;
         }
 
-        public IList<PurchaseSchemeGroupResponse> GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request)
+        public IList<PurchaseSchemeGroupResponse> GetPurchaseSchemeAndGroupList(QuerySchemeAndGroupRequest request, string userId)
         {
+            var user = userBusiness.GetisBargainTeamByUserId(userId);
             var purchaseSchemeGroupsList = fsql.Select<PurchaseSchemeGroup>()
                                                .Where(psg => psg.ShopId == request.ShopId &&
                                                              request.ProductIdList.Contains(psg.ProductId))
+                                               .WhereIf(user.isBargainTeam, psg => psg.BelongBargainTeamId == user.department.Id)
                                                .ToList<PurchaseSchemeGroupResponse>();
             if (purchaseSchemeGroupsList.Count() > 0)
             {

BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs

@@ -541,7 +541,7 @@ namespace BBWYB.Server.Business
         public ListResponse<SpuOptimizationTaskResponse> 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<SpuOptimizationTask> select = null;
             if (request.SpuOptimizationTaskId != null && request.SpuOptimizationTaskId != 0)

BBWYB.Server.Model/Db/PurchaseScheme/PurchaseSchemeGroup.cs

@@ -7,39 +7,44 @@ namespace BBWYB.Server.Model.Db
     /// 采购方案分组表
     /// </summary>
     [Table(Name = "purchaseschemegroup", DisableSyncStructure = true)]
-	public partial class PurchaseSchemeGroup
+    public partial class PurchaseSchemeGroup
     {
 
-		/// <summary>
+        /// <summary>
-		/// 分组Id
+        /// 分组Id
-		/// </summary>
+        /// </summary>
-		[Column(DbType = "bigint", IsPrimary = true)]
+        [Column(DbType = "bigint", IsPrimary = true)]
-		public long Id { get; set; }
+        public long Id { get; set; }
-
+
-		/// <summary>
+        /// <summary>
-		/// 创建时间
+        /// 创建时间
-		/// </summary>
+        /// </summary>
-		[Column(DbType = "datetime")]
+        [Column(DbType = "datetime")]
-		public DateTime? CreateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
-
+
-		/// <summary>
+        /// <summary>
-		/// 组名
+        /// 组名
-		/// </summary>
+        /// </summary>
-		[Column(StringLength = 100)]
+        [Column(StringLength = 100)]
-		public string GroupName { get; set; }
+        public string GroupName { get; set; }
-
+
-		/// <summary>
+        /// <summary>
-		/// 店铺spu,店铺商品Id
+        /// 店铺spu,店铺商品Id
-		/// </summary>
+        /// </summary>
-		[Column(StringLength = 50)]
+        [Column(StringLength = 50)]
-		public string ProductId { get; set; }
+        public string ProductId { get; set; }
-
+
-		/// <summary>
+        /// <summary>
-		/// 店铺Id
+        /// 店铺Id
-		/// </summary>
+        /// </summary>
-		[Column(DbType = "bigint")]
+        [Column(DbType = "bigint")]
-		public long? ShopId { get; set; }
+        public long? ShopId { get; set; }
-
+
-	}
+        /// <summary>
+        /// 归属议价组
+        /// </summary>
+        [Column(StringLength = 50)]
+        public string BelongBargainTeamId { get; set; }
+    }
 
 }