From cfdbdb7fa31dff1f934921042b67216ac07bd63c Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Thu, 17 Dec 2020 16:59:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E9=A1=B9=E7=9B=AE=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/common/head/HeaderOrgWs.vue | 12 ++++++------
 .../business/components/common/head/SearchList.vue  | 13 ++++++++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderOrgWs.vue
index 5b8a565245..dce8deb518 100644
--- a/frontend/src/business/components/common/head/HeaderOrgWs.vue
+++ b/frontend/src/business/components/common/head/HeaderOrgWs.vue
@@ -108,9 +108,9 @@ import {
           if (response.data.workspaceId) {
             localStorage.setItem("workspace_id", response.data.workspaceId);
           }
-          localStorage.removeItem(PROJECT_ID)
-          this.$router.push('/');
-          window.location.reload();
+          this.$router.push('/').then(() => {
+            window.location.reload();
+          }).catch(err => err);
         });
       },
       changeWs(data) {
@@ -121,9 +121,9 @@ import {
         this.$post("/user/switch/source/ws/" + workspaceId, {}, response => {
           saveLocalStorage(response);
           localStorage.setItem("workspace_id", workspaceId);
-          localStorage.removeItem(PROJECT_ID)
-          this.$router.push('/');
-          window.location.reload();
+          this.$router.push('/').then(() => {
+            window.location.reload();
+          }).catch(err => err);
         })
       }
     }
diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index 4b861ec45a..afc70864c9 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -68,10 +68,17 @@ export default {
         this.result = this.$get("/project/listAll", response => {
           this.items = response.data;
           this.searchArray = response.data;
-          if (!getCurrentProjectID() && this.items.length > 0) {
-            this.change(this.items[0].id);
-          }
           let projectId = getCurrentProjectID();
+          if (projectId) {
+            // 保存的 projectId 是否存在; 切换工作空间后
+            if (this.searchArray.length > 0 && this.searchArray.map(p => p.id).indexOf(projectId) === -1) {
+              this.change(this.items[0].id);
+            }
+          } else {
+            if (this.items.length > 0) {
+              this.change(this.items[0].id);
+            }
+          }
           this.changeProjectName(projectId);
         })
       }