From eb397506fdd1353553a74c806c4fc2d5ca51ea29 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Wed, 26 Jan 2022 11:22:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml  | 6 +++---
 .../io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
index 3293d8f73c..6c56d42133 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionMapper.xml
@@ -352,18 +352,18 @@
         GROUP BY protocol
     </select>
     <select id="countStateByProjectID" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
-        SELECT status AS groupField,count(id) AS countNumber FROM api_definition  WHERE project_id = #{0} AND `status` != 'Trash' GROUP BY status
+        SELECT status AS groupField,count(id) AS countNumber FROM api_definition  WHERE project_id = #{0} AND `status` != 'Trash' AND latest = 1 GROUP BY status
     </select>
     <select id="countByProjectIDAndCreateInThisWeek" resultType="java.lang.Long">
         SELECT count(id) AS countNumber FROM api_definition
         WHERE project_id = #{projectId}
-        AND create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp} AND `status` != 'Trash'
+        AND create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp} AND `status` != 'Trash' AND latest = 1
     </select>
     <select id="countApiCoverageByProjectID" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
         SELECT count(api.id) AS countNumber, if(test_case_api.api_definition_id is null,"uncoverage","coverage") AS groupField  FROM api_definition api left Join (
             SELECT DISTINCT api_definition_id FROM api_test_case WHERE status is null or status != 'Trash'
         ) test_case_api ON api.id = test_case_api.api_definition_id
-        WHERE api.project_id = #{0} and  api.`status` != 'Trash'
+        WHERE api.project_id = #{0} and  api.`status` != 'Trash' and api.latest = 1
         GROUP BY groupField
     </select>
     <select id="getNextNum" resultType="io.metersphere.base.domain.ApiDefinition">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 3ae3522052..022f3033aa 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -426,13 +426,13 @@
     </select>
     <select id="countByProjectIDAndCreatInThisWeek" resultType="java.lang.Long">
         SELECT count(id) AS countNumber FROM api_scenario
-        WHERE project_id = #{projectId}  AND status != 'Trash'
+        WHERE project_id = #{projectId}  AND status != 'Trash' and latest = 1
         AND create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp}
     </select>
 
     <select id="countRunResultByProjectID" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
         SELECT count(id) AS countNumber, if(last_result is null,"notRun",last_result) AS groupField  FROM api_scenario
-        WHERE project_id = #{0} AND status != 'Trash'
+        WHERE project_id = #{0} AND status != 'Trash' and latest = 1
         GROUP BY groupField
     </select>
 
@@ -504,7 +504,7 @@
 
     <select id="countExecuteTimesByProjectID" resultType="java.lang.Long">
         SELECT SUM(execute_times) FROM api_scenario
-        WHERE project_id = #{0}
+        WHERE project_id = #{0} and latest = 1
     </select>
     <select id="selectProjectIds" resultType="java.lang.String">
         select DISTINCT project_id from api_scenario;