From 26573638f29fa7b066f220f9dbbb71fb6d3c4131 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Sat, 15 Oct 2022 21:21:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dswagger=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=8A=A5=E9=94=99=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018146 --user=王孝刚 【接口测试】swagger定时任务通知，修改任务通知模板报错
https://www.tapd.cn/55049933/s/1262673
--bug=1018144 --user=王孝刚
【接口测试】swagger定时同步-任务通知，修改任务通知后，被修改的通知消失了
https://www.tapd.cn/55049933/s/1262697
---
 framework/sdk-parent/frontend/src/api/notice.js             | 6 ++++++
 .../sdk-parent/frontend/src/components/MxNoticeTemplate.vue | 6 ++++--
 .../java/io/metersphere/notice/service/NoticeService.java   | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 framework/sdk-parent/frontend/src/api/notice.js

diff --git a/framework/sdk-parent/frontend/src/api/notice.js b/framework/sdk-parent/frontend/src/api/notice.js
new file mode 100644
index 0000000000..5a1296aa0b
--- /dev/null
+++ b/framework/sdk-parent/frontend/src/api/notice.js
@@ -0,0 +1,6 @@
+import {post} from "../plugins/request"
+
+export function saveNoticeTemplate(notice) {
+  return post('/notice/template/save', notice);
+}
+
diff --git a/framework/sdk-parent/frontend/src/components/MxNoticeTemplate.vue b/framework/sdk-parent/frontend/src/components/MxNoticeTemplate.vue
index 871a8a7bb8..65ff9763a4 100644
--- a/framework/sdk-parent/frontend/src/components/MxNoticeTemplate.vue
+++ b/framework/sdk-parent/frontend/src/components/MxNoticeTemplate.vue
@@ -41,6 +41,8 @@
 
 <script>
 
+import {saveNoticeTemplate} from "../api/notice";
+
 export default {
   name: "MxNoticeTemplate",
   props: {
@@ -70,12 +72,12 @@ export default {
     saveTemplate() {
       if (this.currentRow.template == "undefined" || this.currentRow.template == "" || this.currentRow.template == null) {
         this.currentRow.template = "";
-        this.$post('/notice/template/save', this.currentRow, response => {
+        saveNoticeTemplate(this.currentRow).then(response => {
           this.$success(this.$t('commons.save_success'));
           this.dialogFormVisible = false;
         });
       } else {
-        this.$post('/notice/template/save', this.currentRow, response => {
+        saveNoticeTemplate(this.currentRow).then(response => {
           this.$success(this.$t('commons.save_success'));
           this.dialogFormVisible = false;
         });
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/notice/service/NoticeService.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/notice/service/NoticeService.java
index 2d1e0844b6..0b531de6a1 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/notice/service/NoticeService.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/notice/service/NoticeService.java
@@ -153,6 +153,7 @@ public class NoticeService {
             messageDetail.setIdentification(m.getIdentification());
             messageDetail.setType(m.getType());
             messageDetail.setIsSet(m.getIsSet());
+            messageDetail.setTestId(m.getTestId());
             messageDetail.setCreateTime(m.getCreateTime());
             messageDetail.setTemplate(m.getTemplate());
         }