From 11c3a222a1ca8816fa3b4e4380b95d48227fda7d Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 16 Mar 2023 18:09:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=88=91=E7=9A=84=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=9C=89=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024415 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001024415
---
 .../java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml | 1 +
 .../java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index 9088a9cdd7..6aa728337d 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -213,6 +213,7 @@
                                     test_plan_test_case.status in
                                     <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.filterInWrapper"/>
                                     ))
+                                    and (test_plan.status is null or test_plan.status != 'Trash')
                                 </when>
                                 <otherwise>
                                     and test_plan.status in
diff --git a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index cd746af7ee..1fa7f3ace3 100644
--- a/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/workstation/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -216,11 +216,11 @@
         and (tp.status is null or tp.status != 'Trash');
     </select>
     <select id="getCountUpcoming" resultType="java.lang.Integer">
-        select count(*) from test_plan
+        select COUNT(DISTINCT(test_plan.id)) from test_plan
         left join test_plan_principal ON test_plan_principal.test_plan_id = test_plan.id
         left join test_plan_test_case on test_plan_test_case.plan_id = test_plan.id
         where
-        test_plan.project_id   in
+        test_plan.project_id in
         <foreach collection="projectIds" item="projectId" separator="," open="(" close=")">
             #{projectId}
         </foreach>