From af39f92e7452eadf64abeac9ecca6626b0d720a3 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Tue, 19 Sep 2023 11:14:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=96=B0=E7=9A=84=E5=B7=A5=E4=BD=9C=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E6=9C=8D=E5=8A=A1=E9=9B=86=E6=88=90=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1030732 --user=宋昌昌 【测试跟踪】github#26790，创建新的工作空间切换后，禅道服务集成成功，但是去创建项目集成第三方平台没有禅道选项 https://www.tapd.cn/55049933/s/1417590
---
 .../integration/AzureDevopsSetting.vue        | 15 +++++++-------
 .../workspace/integration/PlatformConfig.vue  | 20 ++++++++-----------
 .../workspace/integration/TapdSetting.vue     | 13 ++++++------
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/system-setting/frontend/src/business/workspace/integration/AzureDevopsSetting.vue b/system-setting/frontend/src/business/workspace/integration/AzureDevopsSetting.vue
index 61efac9ecc..215728f143 100644
--- a/system-setting/frontend/src/business/workspace/integration/AzureDevopsSetting.vue
+++ b/system-setting/frontend/src/business/workspace/integration/AzureDevopsSetting.vue
@@ -70,8 +70,8 @@
 
 <script>
 import BugManageBtn from "./BugManageBtn";
-import {getCurrentUser, getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
-import {AZURE_DEVOPS,AZURE_DEVOP_URL} from "metersphere-frontend/src/utils/constants";
+import {getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
+import {AZURE_DEVOPS} from "metersphere-frontend/src/utils/constants";
 import MsInstructionsIcon from "metersphere-frontend/src/components/MsInstructionsIcon";
 import MsPersonRouter from "metersphere-frontend/src/components/personal/PersonRouter";
 import {
@@ -124,10 +124,10 @@ export default {
   },
   methods: {
     init() {
-      const {lastWorkspaceId} = getCurrentUser();
+      const workspaceId = getCurrentWorkspaceId();
       let param = {};
       param.platform = AZURE_DEVOPS;
-      param.workspaceId = lastWorkspaceId;
+      param.workspaceId = workspaceId;
       this.$parent.loading = getServiceIntegration(param).then(res => {
         let data = res.data;
         if (data.configuration) {
@@ -157,8 +157,7 @@ export default {
             issuetype: this.form.issuetype,
             storytype: this.form.storytype
           };
-          const {lastWorkspaceId} = getCurrentUser();
-          param.workspaceId = lastWorkspaceId;
+          param.workspaceId = getCurrentWorkspaceId();
           param.platform = AZURE_DEVOPS;
           param.configuration = JSON.stringify(auth);
           this.$parent.loading = saveServiceIntegration(param).then(() => {
@@ -203,9 +202,9 @@ export default {
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
-              const {lastWorkspaceId} = getCurrentUser();
+              const workspaceId = getCurrentWorkspaceId();
               let param = {};
-              param.workspaceId = lastWorkspaceId;
+              param.workspaceId = workspaceId;
               param.platform = AZURE_DEVOPS;
               this.$parent.loading = delServiceIntegration(param).then(() => {
                 this.$success(this.$t('organization.integration.successful_operation'));
diff --git a/system-setting/frontend/src/business/workspace/integration/PlatformConfig.vue b/system-setting/frontend/src/business/workspace/integration/PlatformConfig.vue
index 156165a9d0..17e140376f 100644
--- a/system-setting/frontend/src/business/workspace/integration/PlatformConfig.vue
+++ b/system-setting/frontend/src/business/workspace/integration/PlatformConfig.vue
@@ -64,15 +64,11 @@
 
 <script>
 import BugManageBtn from "./BugManageBtn";
-import {getCurrentUser} from "metersphere-frontend/src/utils/token";
+import {getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
 import MsInstructionsIcon from "metersphere-frontend/src/components/MsInstructionsIcon";
 import MsPersonRouter from "metersphere-frontend/src/components/personal/PersonRouter";
 import CustomFiledComponent from "metersphere-frontend/src/components/template/CustomFiledComponent";
-import {
-  delServiceIntegration,
-  getServiceIntegration,
-  saveServiceIntegration
-} from "../../../api/workspace";
+import {delServiceIntegration, getServiceIntegration, saveServiceIntegration} from "../../../api/workspace";
 import {generatePlatformResourceUrl, validateServiceIntegration} from "@/api/platform-plugin";
 import {getPlatformFormRules} from "metersphere-frontend/src/utils/platform";
 
@@ -103,10 +99,10 @@ export default {
     init() {
       this.rules = getPlatformFormRules(this.config);
 
-      const {lastWorkspaceId} = getCurrentUser();
+      const workspaceId = getCurrentWorkspaceId();
       let param = {};
       param.platform = this.config.key;
-      param.workspaceId = lastWorkspaceId;
+      param.workspaceId = workspaceId;
       this.$parent.loading = getServiceIntegration(param).then(res => {
         let data = res.data;
         if (data.configuration) {
@@ -130,9 +126,9 @@ export default {
         if (valid) {
           let config = {};
           Object.assign(config, this.form);
-          const {lastWorkspaceId} = getCurrentUser();
+          const workspaceId = getCurrentWorkspaceId();
           let param = {};
-          param.workspaceId = lastWorkspaceId;
+          param.workspaceId = workspaceId;
           param.platform = this.config.key;
           param.configuration = JSON.stringify(config);
           this.$parent.loading = saveServiceIntegration(param).then(() => {
@@ -171,9 +167,9 @@ export default {
         confirmButtonText: this.$t('commons.confirm'),
         callback: (action) => {
           if (action === 'confirm') {
-            const {lastWorkspaceId} = getCurrentUser();
+            const workspaceId = getCurrentWorkspaceId();
             let param = {};
-            param.workspaceId = lastWorkspaceId;
+            param.workspaceId = workspaceId;
             param.platform = this.config.key;
             this.$parent.loading = delServiceIntegration(param).then(() => {
               this.$success(this.$t('organization.integration.successful_operation'));
diff --git a/system-setting/frontend/src/business/workspace/integration/TapdSetting.vue b/system-setting/frontend/src/business/workspace/integration/TapdSetting.vue
index e4baec6409..a5e89cc2ca 100644
--- a/system-setting/frontend/src/business/workspace/integration/TapdSetting.vue
+++ b/system-setting/frontend/src/business/workspace/integration/TapdSetting.vue
@@ -50,7 +50,7 @@
 
 <script>
 import BugManageBtn from "./BugManageBtn";
-import {getCurrentUser, getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
+import {getCurrentWorkspaceId} from "metersphere-frontend/src/utils/token";
 import {TAPD} from "metersphere-frontend/src/utils/constants";
 import MsPersonRouter from "metersphere-frontend/src/components/personal/PersonRouter";
 import {
@@ -91,10 +91,10 @@ export default {
   },
   methods: {
     init() {
-      const {lastWorkspaceId} = getCurrentUser();
+      const workspaceId = getCurrentWorkspaceId();
       let param = {};
       param.platform = TAPD;
-      param.workspaceId = lastWorkspaceId;
+      param.workspaceId = workspaceId;
       this.$parent.loading = getServiceIntegration(param).then(res => {
         let data = res.data;
         if (data.configuration) {
@@ -115,8 +115,7 @@ export default {
             account: this.form.account,
             password: this.form.password,
           };
-          const {lastWorkspaceId} = getCurrentUser();
-          param.workspaceId = lastWorkspaceId;
+          param.workspaceId = getCurrentWorkspaceId();
           param.platform = TAPD;
           param.configuration = JSON.stringify(auth);
           this.$parent.loading = saveServiceIntegration(param).then(() => {
@@ -158,9 +157,9 @@ export default {
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
-              const {lastWorkspaceId} = getCurrentUser();
+              const workspaceId = getCurrentWorkspaceId();
               let param = {};
-              param.workspaceId = lastWorkspaceId;
+              param.workspaceId = workspaceId;
               param.platform = TAPD;
               this.$parent.loading = delServiceIntegration(param).then(() => {
                 this.$success(this.$t('organization.integration.successful_operation'));