From f5796eb602ec7ddf65740db4df76aed89675e3cd Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 26 Mar 2021 14:14:40 +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=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestCaseMapper.xml     |  2 +-
 .../track/case/components/TestCaseList.vue    | 22 ++++++-------------
 2 files changed, 8 insertions(+), 16 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 b23321eba5..6930ce6025 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
@@ -274,7 +274,7 @@
                                 #{value}
                             </foreach>
                         </when>
-                        <when test="key=='status'">
+                        <when test="key=='reviewStatus'">
                             and test_case.review_status in
                             <foreach collection="values" item="value" separator="," open="(" close=")">
                                 #{value}
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 8a6220194d..353891d7b0 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -303,20 +303,12 @@ export default {
   },
   created: function () {
     this.$emit('setCondition', this.condition);
-    if (this.trashEnable) {
-      this.condition.filters = {status: ["Trash"]};
-    } else {
-      this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]};
-    }
+    this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
     this.initTableData();
     getSystemLabel(this, this.type)
   },
   activated() {
-    if (this.trashEnable) {
-      this.condition.filters = {status: ["Trash"]};
-    } else {
-      this.condition.filters = {status: ["Prepare", "Pass", "UnPass"]};
-    }
+    this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
     this.initTableData();
   },
   watch: {
@@ -372,15 +364,15 @@ export default {
         case 'coverage':
           this.condition.caseCoverage = 'coverage';
           break;
-       /* case 'Prepare':
-          this.condition.filters.status = [this.selectDataRange];
+        case 'Prepare':
+          this.condition.filters.reviewStatus = [this.selectDataRange];
           break;
         case 'Pass':
-          this.condition.filters.status = [this.selectDataRange];
+          this.condition.filters.reviewStatus = [this.selectDataRange];
           break;
         case 'UnPass':
-          this.condition.filters.status = [this.selectDataRange];
-          break;*/
+          this.condition.filters.reviewStatus = [this.selectDataRange];
+          break;
       }
       if (this.projectId) {
         this.condition.projectId = this.projectId;