From cf4d6d5d9d3a6f65926c6e948a9382f2ac665f54 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 10 Jan 2023 20:19:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=BE=85=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1021803 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001021803
--bug=1021815 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001021815
---
 .../src/business/component/ApiCaseTableList.vue       |  7 ++-----
 .../src/business/component/ApiDefinitionTableList.vue | 11 ++++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/workstation/frontend/src/business/component/ApiCaseTableList.vue b/workstation/frontend/src/business/component/ApiCaseTableList.vue
index 5c99bf72e9..46f677531b 100644
--- a/workstation/frontend/src/business/component/ApiCaseTableList.vue
+++ b/workstation/frontend/src/business/component/ApiCaseTableList.vue
@@ -711,11 +711,8 @@ export default {
         this.condition.combine = {creator: {operator: "current user", value: "current user",}}
       } else {
         if (this.isFinish) {
-          if (this.condition.filters == null || !this.condition.filters) {
-            this.condition.filters = {};
-            if (this.condition.filters.case_status === null || !this.condition.filters.case_status) {
-              this.condition.filters.case_status = ["Prepare", "Underway"];
-            }
+          if (!this.condition.filters || this.condition.filters.case_status === null) {
+            this.condition.filters.case_status = ["Prepare", "Underway"];
           }
           if (this.condition.filters.case_status && this.condition.filters.case_status.length > 0) {
             for (let i = 0; i < this.condition.filters.case_status.length; i++) {
diff --git a/workstation/frontend/src/business/component/ApiDefinitionTableList.vue b/workstation/frontend/src/business/component/ApiDefinitionTableList.vue
index 20c9183353..c79e611872 100644
--- a/workstation/frontend/src/business/component/ApiDefinitionTableList.vue
+++ b/workstation/frontend/src/business/component/ApiDefinitionTableList.vue
@@ -763,10 +763,15 @@ export default {
     buildCondition() {
       if (this.isFinish === true) {
         this.batchButtons = this.commonButtons
-        if (this.condition.filters) {
+        if (!this.condition.filters || this.condition.filters.status === null) {
           this.condition.filters.status = ["Prepare", "Underway"];
-        } else {
-          this.condition.filters = {status: ["Prepare", "Underway"]};
+        }
+        if (this.condition.filters.status && this.condition.filters.status.length > 0) {
+          for (let i = 0; i < this.condition.filters.status.length; i++) {
+            if (this.condition.filters.status[i] === "Completed") {
+              this.condition.filters.status[i] = "NO"
+            }
+          }
         }
         this.condition.combine = {creator: {operator: "current user", value: "current user",}}
         if (this.condition.toUpdate) {