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 @@ + + and issues.platform_status + + + + 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() {