From 987ab3b395364834edd798ece91f2034403820a9 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 30 Dec 2020 18:50:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestPlanMapper.xml     |  3 +--
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |  4 +---
 .../home/components/RelatedTestPlanList.vue   | 22 +++++++++----------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index 587b589566..6fc70898e2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -164,11 +164,10 @@
 
     <select id="listRelate" resultType="io.metersphere.track.dto.TestPlanDTOWithMetric">
         select distinct test_plan.* from test_plan
-        inner join test_plan_project on test_plan.id = test_plan_project.test_plan_id
         <where>
             test_plan.workspace_id = #{request.workspaceId}
             <if test="request.projectId != null">
-                and test_plan_project.project_id = #{request.projectId}
+                and test_plan.project_id = #{request.projectId}
             </if>
             and (test_plan.principal = #{request.principal}
             <if test="request.planIds != null and request.planIds.size() > 0">
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 13eda218c7..d8d7c2f912 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -272,13 +272,11 @@
         select distinct plan_id from test_plan_test_case
         inner join test_plan
         on test_plan_test_case.plan_id = test_plan.id
-        inner join test_plan_project
-        on test_plan.id = test_plan_project.test_plan_id
         <where>
             test_plan_test_case.executor = #{userId}
             and test_plan.workspace_id = #{workspaceId}
             <if test="projectId != null">
-                and test_plan_project.project_id = #{projectId}
+                and test_plan.project_id = #{projectId}
             </if>
         </where>
     </select>
diff --git a/frontend/src/business/components/track/home/components/RelatedTestPlanList.vue b/frontend/src/business/components/track/home/components/RelatedTestPlanList.vue
index 39e0e55d17..cad7300910 100644
--- a/frontend/src/business/components/track/home/components/RelatedTestPlanList.vue
+++ b/frontend/src/business/components/track/home/components/RelatedTestPlanList.vue
@@ -58,11 +58,11 @@
           <plan-stage-table-item :stage="scope.row.stage"/>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="projectName"
-        :label="$t('test_track.plan.plan_project')"
-        show-overflow-tooltip>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="projectName"-->
+<!--        :label="$t('test_track.plan.plan_project')"-->
+<!--        show-overflow-tooltip>-->
+<!--      </el-table-column>-->
 
     </el-table>
 
@@ -94,12 +94,12 @@
           }
           this.result = this.$post('/test/plan/list/all/relate', {}, response => {
             this.tableData = response.data;
-            for (let i = 0; i < this.tableData.length; i++) {
-              let path = "/test/plan/project/name/" + this.tableData[i].id;
-              this.$get(path, res => {
-                this.$set(this.tableData[i], "projectName", res.data);
-              })
-            }
+            // for (let i = 0; i < this.tableData.length; i++) {
+            //   let path = "/test/plan/project/name/" + this.tableData[i].id;
+            //   this.$get(path, res => {
+            //     this.$set(this.tableData[i], "projectName", res.data);
+            //   })
+            // }
           });
         },
         intoPlan(row, event, column) {