From 17da33c4649c53d9895ea56ee4751f90ded33f4d Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 25 Jan 2022 16:17:07 +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=E5=A4=8D=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/api/service/ApiDefinitionService.java  |  2 +-
 .../base/mapper/ext/ExtApiDefinitionMapper.xml         | 10 ++++++++--
 .../base/mapper/ext/ExtApiScenarioMapper.xml           |  4 ++--
 .../base/mapper/ext/ExtApiScenarioReportMapper.xml     |  4 ++--
 .../base/mapper/ext/ExtApiTestCaseMapper.xml           |  3 ++-
 .../metersphere/base/mapper/ext/ExtScheduleMapper.xml  |  6 +++---
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 71d9cf7eec..12c705a7ec 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -1780,7 +1780,7 @@ public class ApiDefinitionService {
             return 0;
         } else {
             ApiDefinitionExample example = new ApiDefinitionExample();
-            example.createCriteria().andProjectIdEqualTo(projectId).andStatusNotEqualTo("Trash");
+            example.createCriteria().andProjectIdEqualTo(projectId).andStatusNotEqualTo("Trash").andLatestEqualTo(true);
             return apiDefinitionMapper.countByExample(example);
         }
     }
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 2d1728847b..3293d8f73c 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
@@ -344,7 +344,12 @@
     </update>
 
     <select id="countProtocolByProjectID" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
-        SELECT protocol AS groupField,count(DISTINCT ref_id) AS countNumber FROM api_definition  WHERE project_id = #{0} AND `status` != 'Trash' GROUP BY protocol
+        SELECT protocol AS groupField,count(DISTINCT ref_id) AS countNumber
+        FROM api_definition
+        WHERE project_id = #{0}
+            AND `status` != 'Trash'
+            AND latest = 1
+        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
@@ -591,7 +596,7 @@
     <select id="selectEffectiveIdByProjectId" resultType="io.metersphere.base.domain.ApiDefinition">
         select id,path,method
         from api_definition
-        WHERE project_id = #{0} AND status != 'Trash' AND protocol = 'HTTP'
+        WHERE project_id = #{0} AND status != 'Trash' AND protocol = 'HTTP' AND latest = 1
     </select>
 
     <select id="moduleCount" resultType="java.lang.Integer">
@@ -826,6 +831,7 @@
                         SELECT api_definition_id FROM api_test_case WHERE `status` is null or `status` != 'Trash'
                     )
             )
+        AND latest = 1
     </select>
     <select id="getForGraph" resultType="io.metersphere.dto.RelationshipGraphData$Node">
         select id,num,`name`
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 0e233d7b82..3ae3522052 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
@@ -416,13 +416,13 @@
     </update>
 
     <select id="countByProjectID" resultType="java.lang.Long">
-        SELECT COUNT(DISTINCT ref_id) AS countNumber FROM api_scenario WHERE project_id = #{0} AND status != 'Trash'
+        SELECT COUNT(DISTINCT ref_id) AS countNumber FROM api_scenario WHERE project_id = #{0} AND status != 'Trash' AND latest = 1
     </select>
     <select id="selectIdAndScenarioByProjectId" resultType="io.metersphere.base.domain.ApiScenarioWithBLOBs">
         SELECT id,scenario_definition FROM api_scenario WHERE project_id = #{0} AND status != 'Trash'
     </select>
     <select id="selectIdAndUseUrlByProjectId" resultType="io.metersphere.base.domain.ApiScenarioWithBLOBs">
-        SELECT id,use_url FROM api_scenario WHERE project_id = #{0} AND status != 'Trash'
+        SELECT id,use_url FROM api_scenario WHERE project_id = #{0} AND status != 'Trash' AND latest = 1
     </select>
     <select id="countByProjectIDAndCreatInThisWeek" resultType="java.lang.Long">
         SELECT count(id) AS countNumber FROM api_scenario
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
index 27cc0455be..a08b76143b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
@@ -230,7 +230,7 @@
         SELECT count(ar.id) AS countNumber FROM
         api_scenario_report ar
         INNER JOIN (
-            SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
+            SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id and latest = 1
         ) ac on ar.scenario_id = ac.id
         WHERE ar.project_id = #{projectId} AND ar.trigger_mode = 'SCHEDULE' AND ar.create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp}
     </select>
@@ -239,7 +239,7 @@
         SELECT count(ar.id) AS countNumber,ar.status AS groupField FROM
         api_scenario_report ar
         INNER JOIN (
-        SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
+        SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id and latest = 1
         ) ac on ar.scenario_id = ac.id
         WHERE ar.project_id = #{projectId} AND ar.trigger_mode = 'SCHEDULE'
         GROUP BY groupField;
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index f4b6d9a77a..16b22e8163 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -542,7 +542,7 @@
     <select id="countProtocolByProjectID" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
         SELECT apiDef.protocol AS groupField,COUNT(testCase.id) AS countNumber FROM api_test_case testCase
         INNER JOIN  api_definition apiDef ON testCase.api_definition_id = apiDef.id
-        WHERE testCase.project_id = #{0} AND (testCase.status IS NULL or testCase.status != "Trash")
+        WHERE testCase.project_id = #{0} AND (testCase.status IS NULL or testCase.status != "Trash") and latest = 1
         GROUP BY apiDef.protocol
     </select>
     <select id="findApiUrlAndMethodById" resultType="io.metersphere.base.domain.ApiDefinition">
@@ -556,6 +556,7 @@
         INNER JOIN  api_definition apiDef ON testCase.api_definition_id = apiDef.id
         WHERE testCase.project_id = #{projectId}AND apiDef.status != "Trash"
           AND testCase.create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp}
+          and latest = 1
     </select>
 
     <select id="moduleCount" resultType="java.lang.Integer">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
index d812fcd6c7..f982d2e913 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
@@ -49,7 +49,7 @@
         SELECT COUNT(id) AS countNumber
         FROM `schedule`
         WHERE resource_id IN (
-            SELECT id FROM api_scenario WHERE project_id = #{0,jdbcType=VARCHAR} AND status != 'Trash'
+            SELECT id FROM api_scenario WHERE project_id = #{0,jdbcType=VARCHAR} AND status != 'Trash' AND latest = 1
         )
     </select>
     <select id="countTaskByProjectIdAndCreateTimeRange" resultType="java.lang.Long">
@@ -59,9 +59,9 @@
             SELECT scene.id
             FROM api_scenario scene
             WHERE scene.project_id = #{projectId,jdbcType=VARCHAR}
-              AND scene.status != 'Trash'
+              AND scene.status != 'Trash' AND latest = 1
         )
-          AND create_time BETWEEN #{startTime} and #{endTime}
+          AND create_time BETWEEN #{startTime} AND #{endTime}
     </select>
     <select id="findRunningTaskInfoByProjectID" resultType="io.metersphere.api.dto.datacount.response.TaskInfoResult">
         SELECT sch.id AS taskID,