diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderOrgWs.vue
index dce8deb518..35bdad37be 100644
--- a/frontend/src/business/components/common/head/HeaderOrgWs.vue
+++ b/frontend/src/business/components/common/head/HeaderOrgWs.vue
@@ -108,6 +108,7 @@ import {
           if (response.data.workspaceId) {
             localStorage.setItem("workspace_id", response.data.workspaceId);
           }
+          localStorage.removeItem(PROJECT_ID);
           this.$router.push('/').then(() => {
             window.location.reload();
           }).catch(err => err);
@@ -121,6 +122,7 @@ import {
         this.$post("/user/switch/source/ws/" + workspaceId, {}, response => {
           saveLocalStorage(response);
           localStorage.setItem("workspace_id", workspaceId);
+          localStorage.removeItem(PROJECT_ID);
           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 afc70864c9..1cc176fd5e 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -36,11 +36,6 @@ export default {
     currentProject: String
   },
   created() {
-    if (getCurrentUser().lastProjectId) {
-      localStorage.setItem(PROJECT_ID, getCurrentUser().lastProjectId);
-    }
-  },
-  mounted() {
     this.init();
   },
   computed: {
@@ -68,9 +63,16 @@ export default {
         this.result = this.$get("/project/listAll", response => {
           this.items = response.data;
           this.searchArray = response.data;
+          let userLastProjectId = getCurrentUser().lastProjectId;
+          if (userLastProjectId) {
+            // id 是否存在
+            if (this.searchArray.length > 0 && this.searchArray.map(p => p.id).indexOf(userLastProjectId) !== -1) {
+              localStorage.setItem(PROJECT_ID, userLastProjectId);
+            }
+          }
           let projectId = getCurrentProjectID();
           if (projectId) {
-            // 保存的 projectId 是否存在; 切换工作空间后
+            // 保存的 projectId 在当前项目列表是否存在; 切换工作空间后
             if (this.searchArray.length > 0 && this.searchArray.map(p => p.id).indexOf(projectId) === -1) {
               this.change(this.items[0].id);
             }