diff --git a/BBWYB.Server.API/Controllers/SkuOptimizationController.cs b/BBWYB.Server.API/Controllers/SkuOptimizationController.cs index 9d9b66b..03c910f 100644 --- a/BBWYB.Server.API/Controllers/SkuOptimizationController.cs +++ b/BBWYB.Server.API/Controllers/SkuOptimizationController.cs @@ -78,7 +78,7 @@ namespace BBWYB.Server.API.Controllers [HttpGet] public long GetNoCompletedSpuOptimizationTaskCount() { - return optimizationBusiness.GetNoCompletedSpuOptimizationTaskCount(); + return optimizationBusiness.GetNoCompletedSpuOptimizationTaskCount(GetUserId()); } } } diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs index 7439363..d6250e1 100644 --- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs @@ -960,8 +960,20 @@ namespace BBWYB.Server.Business //fsql.Delete(ctTaskIdList).ExecuteAffrows(); } - public long GetNoCompletedSpuOptimizationTaskCount() + public long GetNoCompletedSpuOptimizationTaskCount(string userId) { + var uInfo = userBusiness.GetisBargainTeamByUserId(userId); + if (uInfo.isBargainTeam) + { + var barginTeamId = uInfo.bargainTeam?.Id ?? string.Empty; + return fsql.Select().Where(t => t.IsOptimizationCompleted == false && + fsql.Select() + .Where(sbt => sbt.IsOptimizationCompleted == false && + sbt.SpuOptimizationTaskId == t.Id && + sbt.BelongTeamId == barginTeamId) + .Any()).Count(); + } + return fsql.Select().Where(t => t.IsOptimizationCompleted == false).Count(); } }