diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
index 00c1c86aab..1ab6e3b292 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import {getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentOrganizationId, getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import Crontab from "@/business/components/common/cron/Crontab";
 import CrontabResult from "@/business/components/common/cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";
@@ -171,7 +171,7 @@ export default {
     initUserList() {
       let param = {
         name: '',
-        organizationId: this.currentUser().lastOrganizationId
+        organizationId: getCurrentOrganizationId()
       };
 
       this.result = this.$post('user/org/member/list/all', param, response => {
diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue
index cd4dbedfa1..ecbd862186 100644
--- a/frontend/src/business/components/common/components/MsScheduleEdit.vue
+++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import {getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentOrganizationId, getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import Crontab from "../cron/Crontab";
 import CrontabResult from "../cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";
@@ -112,7 +112,7 @@ export default {
     initUserList() {
       let param = {
         name: '',
-        organizationId: this.currentUser().lastOrganizationId
+        organizationId: getCurrentOrganizationId()
       };
 
       this.result = this.$post('user/org/member/list/all', param, response => {
diff --git a/frontend/src/business/components/settings/organization/TaskNotification.vue b/frontend/src/business/components/settings/organization/TaskNotification.vue
index 375dc7e5fc..84cb08f9b3 100644
--- a/frontend/src/business/components/settings/organization/TaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/TaskNotification.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import {getCurrentUser} from "@/common/js/utils";
+import {getCurrentOrganizationId, getCurrentUser} from "@/common/js/utils";
 import JenkinsNotification from "@/business/components/settings/organization/components/JenkinsNotification";
 import TestPlanTaskNotification from "@/business/components/settings/organization/components/TestPlanTaskNotification";
 import TestReviewNotification from "@/business/components/settings/organization/components/TestReviewNotification";
@@ -60,7 +60,7 @@ export default {
     initUserList() {
       let param = {
         name: '',
-        organizationId: this.currentUser().lastOrganizationId
+        organizationId: getCurrentOrganizationId()
       };
       this.result = this.$post('user/org/member/list/all', param, response => {
         this.jenkinsReceiverOptions = response.data
diff --git a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
index 2ed0d8fcbc..a38475fe41 100644
--- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="10">
+      <el-col :span="20">
         <el-button icon="el-icon-circle-plus-outline" plain size="mini"
                    @click="handleAddTaskModel">
           {{ $t('organization.message.create_new_notification') }}
@@ -12,7 +12,7 @@
           width="600"
           trigger="click">
           <ms-code-edit :read-only="true" height="400px" :data.sync="title" :modes="modes" :mode="'html'"/>
-          <el-button icon="el-icon-warning" plain size="mini" slot="reference">
+          <el-button icon="el-icon-warning" plain size="mini" slot="reference" style="margin-left: 10px">
             {{ $t('organization.message.mail_template_example') }}
           </el-button>
         </el-popover>
@@ -20,9 +20,9 @@
           placement="right-end"
           title="示例"
           width="200"
-          trigger="click" >
+          trigger="click">
           <ms-code-edit :read-only="true" height="200px" :data.sync="robotTitle" :modes="modes" :mode="'text'"/>
-          <el-button icon="el-icon-warning" plain size="mini" slot="reference">
+          <el-button icon="el-icon-warning" plain size="mini" slot="reference" style="margin-left: 10px">
             {{ $t('organization.message.robot_template') }}
           </el-button>
         </el-popover>
@@ -209,7 +209,7 @@ export default {
         {value: 'WECHAT_ROBOT', label: this.$t('organization.message.enterprise_wechat_robot')},
         {value: 'LARK', label: this.$t('organization.message.lark')}
       ],
-    }
+    };
   },
   mounted() {
     this.initForm()
@@ -219,7 +219,7 @@ export default {
       this.result = this.$get('/notice/search/message/' + this.testId, response => {
         // console.log(response.data);
         this.scheduleTask = response.data;
-      })
+      });
     },
     handleEdit(index, data) {
       data.isReadOnly = true;
@@ -268,13 +268,13 @@ export default {
     },
     addTask(data) {
       this.result = this.$post("/notice/save/message/task", data, () => {
-        this.initForm()
+        this.initForm();
         this.$success(this.$t('commons.save_success'));
-      })
+      });
     },
     removeRowTask(index, data) { //移除
       if (!data[index].identification) {
-        data.splice(index, 1)
+        data.splice(index, 1);
       } else {
         data[index].isSet = false;
       }
@@ -282,22 +282,27 @@ export default {
     deleteRowTask(index, data) { //删除
       this.result = this.$get("/notice/delete/message/" + data.identification, response => {
         this.$success(this.$t('commons.delete_success'));
-        this.initForm()
-      })
+        this.initForm();
+      });
     },
     rowClass() {
-      return "text-align:center"
+      return "text-align:center";
     },
     headClass() {
-      return "text-align:center;background:'#ededed'"
+      return "text-align:center;background:'#ededed'";
     },
     handleTemplate(index, row) {
       if (hasLicense()) {
         this.$refs.noticeTemplate.open(row);
       }
     }
+  },
+  watch: {
+    testId() {
+      this.initForm();
+    }
   }
-}
+};
 </script>
 
 <style scoped>
diff --git a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
index 49b66c16e6..b41b805de1 100644
--- a/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
+++ b/frontend/src/business/components/track/plan/components/ScheduleMaintain.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import {getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {getCurrentOrganizationId, getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import Crontab from "@/business/components/common/cron/Crontab";
 import CrontabResult from "@/business/components/common/cron/CrontabResult";
 import {cronValidate} from "@/common/js/cron";
@@ -225,7 +225,7 @@ export default {
     initUserList() {
       let param = {
         name: '',
-        organizationId: this.currentUser().lastOrganizationId
+        organizationId: getCurrentOrganizationId()
       };
 
       this.result = this.$post('user/org/member/list/all', param, response => {