From 8333c3f77d2ac7ce9c591964f0055157b07cfe41 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 27 Nov 2020 13:39:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9C=80=E8=BF=91=E6=B5=8B=E8=AF=95=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestPlanTestCaseMapper.java     |  1 +
 .../base/mapper/ext/ExtTestPlanTestCaseMapper.xml      | 10 ++++++++++
 .../track/service/TestPlanTestCaseService.java         |  6 ++----
 .../track/home/components/TestCaseSideList.vue         |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index 1bff19ab89..147bf91dbc 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -38,4 +38,5 @@ public interface ExtTestPlanTestCaseMapper {
      */
     List<TestPlanCaseDTO> listTestCaseByProjectIds(@Param("ids") List<String> ids);
 
+    TestPlanCaseDTO get(String testPlanTestCaseId);
 }
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 7b267835c1..c3025bea29 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
@@ -307,6 +307,16 @@
             </if>
         </where>
     </select>
+
+    <select id="get" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
+        select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model, project.name as projectName
+        from test_plan_test_case
+        inner join test_case on test_plan_test_case.case_id = test_case.id
+        left join test_case_node on test_case_node.id=test_case.node_id
+        inner join project on project.id = test_case.project_id
+        where test_plan_test_case.id = #{testPlanTestCaseId}
+    </select>
+
     <update id="updateTestCaseStates" parameterType="java.lang.String">
         update test_plan_test_case
         <set>
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index 04abe860b0..e5d306bf4f 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -129,10 +129,8 @@ public class TestPlanTestCaseService {
         request.setExecutor(user.getId());
     }
 
-    public TestPlanCaseDTO get(String caseId) {
-        QueryTestPlanCaseRequest request = new QueryTestPlanCaseRequest();
-        request.setId(caseId);
-        return extTestPlanTestCaseMapper.list(request).get(0);
+    public TestPlanCaseDTO get(String testplanTestCaseId) {
+        return extTestPlanTestCaseMapper.get(testplanTestCaseId);
     }
 
     public void deleteTestCaseBath(TestPlanCaseBatchRequest request) {
diff --git a/frontend/src/business/components/track/home/components/TestCaseSideList.vue b/frontend/src/business/components/track/home/components/TestCaseSideList.vue
index fa51914573..26f3a97663 100644
--- a/frontend/src/business/components/track/home/components/TestCaseSideList.vue
+++ b/frontend/src/business/components/track/home/components/TestCaseSideList.vue
@@ -85,7 +85,7 @@
         });
       },
       editTestCase(row, event, column) {
-        this.$router.push('/track/plan/view/edit/' + row.caseId)
+        this.$router.push('/track/plan/view/edit/' + row.id)
       }
     }
   }