From 02a8c2a2e5052731ca0a9709d8b3eebeeae3b723 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 22 Mar 2021 18:31:47 +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=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml    | 6 +++---
 frontend/src/business/components/track/home/TrackHome.vue   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 f5a09e4567..22a4d71d62 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
@@ -307,7 +307,7 @@
                 or test_case.tags like CONCAT('%', #{request.name},'%'))
             </if>
             <if test="request.createTime >0">
-                AND test_case.create_time >= #{request.createTime}
+                and test_case.id in (select test_case_id from test_case_test where test_case_test.create_time >= #{request.createTime})
             </if>
             <if test="request.nodeIds != null and request.nodeIds.size() > 0">
                 and test_case.node_id in
@@ -320,10 +320,10 @@
             </if>
             <include refid="filters"/>
             <if test="request.caseCoverage == 'uncoverage' ">
-                and test_case.test_id is null and test_case.type != 'functional'
+                and test_case.id not in (select distinct test_case_test.test_case_id from test_case_test)
             </if>
             <if test="request.caseCoverage == 'coverage' ">
-                and test_case.test_id is not null and test_case.type != 'functional'
+                and test_case.id in (select distinct test_case_test.test_case_id from test_case_test)
             </if>
         </where>
     </sql>
diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue
index 798c94966c..a978df9cea 100644
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@@ -188,7 +188,7 @@ export default {
     },
     redirectPage(page,dataType,selectType){
       //test_plan 页面跳转
-      this.$router.push('/track/plan/view/'+selectType);
+      // this.$router.push('/track/plan/view/'+selectType);
       switch (page){
         case "case":
           this.$router.push({name:'testCase',params:{dataType:dataType,dataSelectRange:selectType, projectId: getCurrentProjectID()}});