From f323e737e1ddbb10a4fd78a213e3742143a40a5e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 28 Dec 2020 14:19:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack        |  2 +-
 .../performance/test/PerformanceTestList.vue      | 15 ++++++++-------
 frontend/src/business/components/xpack            |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index f27d1609d7..79343a2763 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit f27d1609d77f7d6c988d37d709466e844d350e17
+Subproject commit 79343a2763b014355f91fc21b2356a95ae437973
diff --git a/frontend/src/business/components/performance/test/PerformanceTestList.vue b/frontend/src/business/components/performance/test/PerformanceTestList.vue
index f122881d18..24246520d2 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestList.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestList.vue
@@ -148,14 +148,15 @@ export default {
     initTableData() {
       if (this.projectId !== 'all') {
         this.condition.projectId = this.projectId;
+        if (!this.condition.projectId) {
+          return;
+        }
       }
-      if (this.condition.projectId) {
-        this.result = this.$post(this.buildPagePath(this.queryPath), this.condition, response => {
-          let data = response.data;
-          this.total = data.itemCount;
-          this.tableData = data.listObject;
-        });
-      }
+      this.result = this.$post(this.buildPagePath(this.queryPath), this.condition, response => {
+        let data = response.data;
+        this.total = data.itemCount;
+        this.tableData = data.listObject;
+      });
     },
     search(combine) {
       this.initTableData(combine);
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 7d43154a7c..8cda5c873c 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 7d43154a7c19732407a8e9ace8a7d1ea13c91f36
+Subproject commit 8cda5c873cd9985c97adb34efacf507167fa4182