From 027e37927803e9f366e6c8ac9ab479657dee1bee Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 4 Apr 2024 00:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=8C=E6=88=90=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SkuOptimizationController.cs       |  2 +-
 .../SkuOptimization/OptimizationBusiness.cs        | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

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<SpuOptimizationCompetitiveTenderTask>(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<SpuOptimizationTask>().Where(t => t.IsOptimizationCompleted == false &&
+                                                                         fsql.Select<SpuOptimizationBargainTeamTask>()
+                                                                        .Where(sbt => sbt.IsOptimizationCompleted == false &&
+                                                                                    sbt.SpuOptimizationTaskId == t.Id &&
+                                                                                    sbt.BelongTeamId == barginTeamId)
+                                                                        .Any()).Count();
+            }
+                
             return fsql.Select<SpuOptimizationTask>().Where(t => t.IsOptimizationCompleted == false).Count();
         }
     }