diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index e7cffd9aa2..2f7ae93749 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -171,6 +171,7 @@
                                             #{value}
                                         </foreach>
                                         ))
+                                        AND test_plan.status != 'Archived'
                                     </when>
                                     <otherwise>
                                         and test_plan.status in
@@ -202,7 +203,7 @@
                     </if>
                 </foreach>
             </if>
-            <if test="request.filters == null or request.filters.size() == 0">
+            <if test="(request.filters == null or request.filters.size() == 0) and request.byFilter != true ">
                 and test_plan.status != 'Archived'
             </if>
             <if test="request.byFilter == true">
diff --git a/frontend/src/business/components/track/plan/TestPlan.vue b/frontend/src/business/components/track/plan/TestPlan.vue
index 117367839e..69d5f8573c 100644
--- a/frontend/src/business/components/track/plan/TestPlan.vue
+++ b/frontend/src/business/components/track/plan/TestPlan.vue
@@ -3,6 +3,7 @@
 
     <ms-main-container>
       <test-plan-list
+        v-if="renderComponent"
         @openTestPlanEditDialog="openTestPlanEditDialog"
         @testPlanEdit="openTestPlanEditDialog"
         ref="testPlanList"/>
@@ -27,6 +28,7 @@
     components: {MsMainContainer, MsContainer, TestPlanList, TestPlanEdit},
     data() {
       return {
+        renderComponent:true
       }
     },
     computed: {
@@ -57,6 +59,14 @@
         this.$refs.testPlanEditDialog.openTestPlanEditDialog(data);
       },
       refreshTestPlanList() {
+        // Remove my-component from the DOM
+        this.renderComponent = false;
+
+        this.$nextTick(() => {
+          // Add the component back in
+          this.renderComponent = true;
+        });
+
         this.$refs.testPlanList.condition = {};
         this.$refs.testPlanList.initTableData();
       }
diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index 313a7f4dca..fcb484ca83 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -252,7 +252,6 @@ export default {
       });
     },
     savePlan() {
-
       this.$refs['planFrom'].validate((valid) => {
         if (valid) {
           let param = {};