From a1a6f6f26520756d00b1e71e2ffae76e283862e0 Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Fri, 29 Dec 2023 13:29:20 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E6=B6=88=E6=81=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E8=B7=AF=E7=94=B1=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/SystemMgm/AdminMgm/loadable.jsx          |  2 ++
 .../SystemMgm/MessageMgm/ConfMes/loadable.jsx      | 31 +++++++++++++++-------
 src/services/SystemMgm/MsgMgm/index.js             | 13 +++++++--
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/pages/SystemMgm/AdminMgm/loadable.jsx b/src/pages/SystemMgm/AdminMgm/loadable.jsx
index 7965e3d..59f961d 100644
--- a/src/pages/SystemMgm/AdminMgm/loadable.jsx
+++ b/src/pages/SystemMgm/AdminMgm/loadable.jsx
@@ -230,6 +230,8 @@ function AdminMgm(props) {
                     getData(formData)
                     setGetRoleStatus(true)
                     setGetAreaStatus(false)
+                } else {
+                    message.error(res.message)
                 }
             })
         }
diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx
index 96d9e73..8f34565 100644
--- a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx
+++ b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx
@@ -183,15 +183,28 @@ function ConfMes(props) {
 
     const ajaxMsgInfoUpdate = (data) => {
         return new Promise((resolve, rejected) => {
-            ajax.msgConfUpdate(data).then((res) => {
-                if (res.status == 20000) {
-                    resolve('消息配置成功')
-                } else {
-                    rejected(res.message)
-                }
-            }).catch((err) => {
-                rejected(err)
-            })
+            if (data.infoId) {
+                ajax.msgConfUpdate(data).then((res) => {
+                    if (res.status == 20000) {
+                        resolve('消息配置成功')
+                    } else {
+                        rejected(res.message)
+                    }
+                }).catch((err) => {
+                    rejected(err)
+                })
+            } else {
+                ajax.msgConfAdd(data).then((res) => {
+                    if (res.status == 20000) {
+                        resolve('消息配置成功')
+                    } else {
+                        rejected(res.message)
+                    }
+                }).catch((err) => {
+                    rejected(err)
+                })
+            }
+
         })
     }
 
diff --git a/src/services/SystemMgm/MsgMgm/index.js b/src/services/SystemMgm/MsgMgm/index.js
index 0fa1cd0..5667da8 100644
--- a/src/services/SystemMgm/MsgMgm/index.js
+++ b/src/services/SystemMgm/MsgMgm/index.js
@@ -18,7 +18,15 @@ const getUserTreeData = (data) => {
 
 const msgConfUpdate = (data) => {
     return ajax({
-        url: "/api/manage/msg/conf/update",
+        url: "/api/manage/msg/conf/edit",
+        type: "post",
+        data: data,
+    })
+}
+
+const msgConfAdd = (data) => {
+    return ajax({
+        url: "/api/manage/msg/conf/add",
         type: "post",
         data: data,
     })
@@ -82,5 +90,6 @@ export default {
     msgNotificationRead,
     msgNotificationDel,
     getDeviceAlarmList,
-    getCarAlarmList
+    getCarAlarmList,
+    msgConfAdd
 }
\ No newline at end of file