From c9f91640bb029b60c12e29f18cd75a040fec018e Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Tue, 28 Mar 2023 16:47:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8=E6=9C=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BALocal=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024905 --user=宋昌昌 【工作台】我的待办-缺陷管理，集成平台为local时，缺陷不显示 https://www.tapd.cn/55049933/s/1356586
---
 .../base/mapper/ext/ExtIssuesMapper.xml       | 20 ++++++++++++++++
 .../src/business/component/IssueTableList.vue | 24 +------------------
 2 files changed, 21 insertions(+), 23 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 08b4330b44..412cf0c2a3 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
@@ -339,6 +339,26 @@
                 <property name="object" value="${condition}.platformStatus"/>
             </include>
         </if>
+        <!--  我的待办中替换过滤条件platformStatus为doneStatus, 单独过滤出待办的缺陷-->
+        <if test="${condition}.doneStatus != null">
+            and (
+                (
+                    issues.platform != 'Local' and
+                    issues.platform_status
+                    <include refid="condition">
+                        <property name="object" value="${condition}.doneStatus"/>
+                    </include>
+                )
+                or
+                (
+                    issues.platform = 'Local' and
+                    issues.status
+                    <include refid="condition">
+                        <property name="object" value="${condition}.doneStatus"/>
+                    </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 7ae052ca8e..353b95a922 100644
--- a/workstation/frontend/src/business/component/IssueTableList.vue
+++ b/workstation/frontend/src/business/component/IssueTableList.vue
@@ -394,29 +394,7 @@ export default {
         }
       }
       if (this.isToDo) {
-        let statusFieldId = null;
-        this.issueTemplate.customFields.forEach(field => {
-          if (field.name === '状态') {
-            statusFieldId = field.id;
-          }
-        });
-        if (statusFieldId) {
-          this.page.condition.combine.platformStatus = [
-            {
-              id: statusFieldId,
-              operator: 'not in',
-              value: [
-                'closed',
-                '已关闭',
-                'resolved',
-                'Done',
-                'verified'
-              ],
-              type: 'select'
-            }
-          ];
-        }
-        this.page.condition.combine.platformStatus = {
+        this.page.condition.combine.doneStatus = {
           operator: "not in",
           value: [
             'closed',