From 4cfb2e38ad4102d89a7ab3c5174de2133dbbfbee Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 29 Oct 2021 18:52:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BE=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/base/mapper/ext/ExtApiScenarioMapper.xml   | 3 ++-
 .../metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml   | 6 +++++-
 .../io/metersphere/base/mapper/ext/ExtIssuesMapper.xml     | 3 ++-
 .../io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml   | 6 +++++-
 .../io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml   | 5 +++--
 .../java/io/metersphere/service/WorkstationService.java    | 4 ++++
 frontend/src/business/components/track/case/TestCase.vue   | 7 ++++++-
 7 files changed, 27 insertions(+), 7 deletions(-)

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 b7763bd7af..2c06341d84 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
@@ -141,7 +141,8 @@
 
     </sql>
     <select id="listModule" resultType="java.lang.Integer">
-        select count(id) from api_scenario
+        select count(api_scenario.id) from api_scenario
+        left join project on api_scenario.project_id = project.id
         <include refid="queryWhereCondition"/>
     </select>
 
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 34e3709f31..3b29a34979 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
@@ -540,7 +540,8 @@
     </select>
 
     <select id="moduleCount" resultType="java.lang.Integer">
-        SELECT count(id)  FROM api_test_case
+        SELECT count(api_test_case.id)  FROM api_test_case
+        left join project on api_test_case.project_id = project.id
         <include refid="criCondition"/>
     </select>
 
@@ -687,6 +688,9 @@
                     <property name="objectKey" value="request.combine.tags"/>
                 </include>
             </if>
+            <if test="request.workspaceId != null">
+                AND project.workspace_id = #{request.workspaceId}
+            </if>
         </where>
     </sql>
 
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index 30c4e39615..1da15e66de 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -30,7 +30,8 @@
         SELECT * FROM issues WHERE issues.project_id = #{projectId} ORDER BY num DESC LIMIT 1;
     </select>
     <select id="getCountByStatus" resultType="io.metersphere.base.domain.IssuesDao">
-        select count(id) as totalIssueCount, ifnull(issues.status,issues.platform_status) as status from issues
+        select count(issues.id) as totalIssueCount, ifnull(issues.status,issues.platform_status) as status from issues
+        left join project on issues.project_id = project.id
         <include refid="queryWhereCondition"/>
         group by status;
     </select>
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
index 4b4f096a81..fe38378844 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
@@ -193,7 +193,8 @@
     </select>
 
     <select id="moduleCount" resultType="java.lang.Integer">
-        select count(id) from load_test
+        select count(load_test.id) from load_test
+        left join project on load_test.project_id = project.id
         <where>
             <if test="request.combine != null">
                 <include refid="countCombine">
@@ -202,6 +203,9 @@
                     <property name="objectKey" value="request.combine.tags"/>
                 </include>
             </if>
+            <if test="request.workspaceId != null">
+                AND project.workspace_id = #{request.workspaceId}
+            </if>
         </where>
     </select>
 
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 5668169fe6..3aab85d7f2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -185,7 +185,8 @@
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
     <select id="moduleCount" resultType="java.lang.Integer">
-        select count(id) from test_case
+        select count(test_case.id) from test_case
+        left join project on test_case.project_id = project.id
         <include refid="queryWhereCondition"/>
     </select>
 
@@ -289,7 +290,7 @@
 
     <select id="selectIds" resultType="java.lang.String">
         select
-        id
+        test_case.id
         from test_case
         <include refid="queryWhereCondition"/>
         <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
diff --git a/backend/src/main/java/io/metersphere/service/WorkstationService.java b/backend/src/main/java/io/metersphere/service/WorkstationService.java
index afa882dad5..4b600e50d8 100644
--- a/backend/src/main/java/io/metersphere/service/WorkstationService.java
+++ b/backend/src/main/java/io/metersphere/service/WorkstationService.java
@@ -35,7 +35,9 @@ public class WorkstationService {
         //build query condition object
         QueryTestPlanRequest testPlanRequest = new QueryTestPlanRequest();
         testPlanRequest.setUserId(userId);
+        testPlanRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         ApiTestCaseRequest apiTestCaseRequest = new ApiTestCaseRequest();
+        apiTestCaseRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         //@see io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml:103
         Map<String, Object> combine = new HashMap<>(2);
         Map<String,String>operatorValue = new HashMap<>(2);
@@ -45,8 +47,10 @@ public class WorkstationService {
         testPlanRequest.setCombine(combine);
         apiTestCaseRequest.setCombine(combine);
         ApiScenarioRequest apiScenarioRequest = new ApiScenarioRequest();
+        apiScenarioRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         apiScenarioRequest.setCombine(combine);
         QueryTestCaseRequest testCaseRequest = new QueryTestCaseRequest();
+        testCaseRequest.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
         testCaseRequest.setCombine(combine);
         //query db
         int apiScenarioCaseCount = extApiScenarioMapper.listModule(apiScenarioRequest);
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 25415ac806..91700050c9 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -171,7 +171,12 @@ export default {
   },
   mounted() {
     this.getProject();
-    this.init(this.$route);
+    let routeTestCase = this.$route.params.testCase;
+    if(routeTestCase && routeTestCase.add===true){
+      this.addTab({name: 'add'});
+    }else {
+      this.init(this.$route);
+    }
   },
   watch: {
     redirectID() {