From c290744c169586578be552ac8016ea5faaf15b7b Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 14 Mar 2023 14:32:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E6=88=91=E7=9A=84=E5=BE=85=E5=8A=9E=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BA=86=E5=B7=B2=E5=85=B3=E9=97=AD=E7=9A=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1021915 --user=郭雨琦 [我的工作台]我的待办-缺陷管理中有已关闭状态的缺陷 https://www.tapd.cn/55049933/s/1327005
---
 .../base/mapper/ext/ExtIssuesMapper.xml       |  6 ++++
 .../src/business/component/IssueTableList.vue | 29 ++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index 3c5f7ec572..08b4330b44 100644
--- a/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/test-track/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -333,6 +333,12 @@
                 <property name="object" value="${condition}.platform"/>
             </include>
         </if>
+        <if test="${condition}.platformStatus != null">
+            and issues.platform_status
+            <include refid="condition">
+                <property name="object" value="${condition}.platformStatus"/>
+            </include>
+        </if>
         <if test="${condition}.followPeople != null">
             and issues.id in (
             select issue_id from issue_follow where follow_id
diff --git a/workstation/frontend/src/business/component/IssueTableList.vue b/workstation/frontend/src/business/component/IssueTableList.vue
index 6b51c42238..7ae052ca8e 100644
--- a/workstation/frontend/src/business/component/IssueTableList.vue
+++ b/workstation/frontend/src/business/component/IssueTableList.vue
@@ -312,7 +312,7 @@ export default {
           }
         }
         if (this.isToDo && item.id === '状态') {
-          item.filters = item.filters.filter(i => i.value !== 'closed')
+          item.filters = item.filters.filter(i => (i.value !== 'closed' && i.value !== '已关闭' && i.value !== 'resolved' && i.value !== 'Done' && i.value !== 'verified'))
         }
       });
 
@@ -401,17 +401,38 @@ export default {
           }
         });
         if (statusFieldId) {
-          this.page.condition.combine.customs = [
+          this.page.condition.combine.platformStatus = [
             {
               id: statusFieldId,
               operator: 'not in',
-              value:[
-                'closed'
+              value: [
+                'closed',
+                '已关闭',
+                'resolved',
+                'Done',
+                'verified'
               ],
               type: 'select'
             }
           ];
         }
+        this.page.condition.combine.platformStatus = {
+          operator: "not in",
+          value: [
+            'closed',
+            '已关闭',
+            '已完成',
+            '完成',
+            '拒绝',
+            '已拒绝',
+            'rejected',
+            'delete',
+            'resolved',
+            'Done',
+            'verified',
+            '已验证'
+          ],
+        }
       }
     },
     initCustomFieldValue() {