From ec59bd6c0a86a53f6ee448d32cafbd47f479ede9 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Thu, 24 Nov 2022 10:50:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AD=97=E6=AE=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/models/alarm_push_config.js                  | 9 +++++++++
 web/client/src/sections/service/components/pushModal.jsx | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/api/app/lib/models/alarm_push_config.js b/api/app/lib/models/alarm_push_config.js
index 24c9417..0472461 100644
--- a/api/app/lib/models/alarm_push_config.js
+++ b/api/app/lib/models/alarm_push_config.js
@@ -51,6 +51,15 @@ module.exports = dc => {
          field: "alarm_sub_type",
          autoIncrement: false
       },
+      pomsStrucFactorId: {
+         type: DataTypes.JSONB,
+         allowNull: true,
+         defaultValue: null,
+         comment: "监听的告警类型",
+         primaryKey: false,
+         field: "poms_struc_factor_id",
+         autoIncrement: false
+      },
       receiverPepUserId: {
          type: DataTypes.ARRAY(DataTypes.INTEGER),
          allowNull: true,
diff --git a/web/client/src/sections/service/components/pushModal.jsx b/web/client/src/sections/service/components/pushModal.jsx
index 2325e7c..3512a39 100644
--- a/web/client/src/sections/service/components/pushModal.jsx
+++ b/web/client/src/sections/service/components/pushModal.jsx
@@ -403,7 +403,11 @@ function pushModal (props) {
                            key={u.name + u.index}
                            field={u.value}
                            style={{ width: 695 }}
-                           initValue={(editObj?.id && (editObj?.alarmSubType ? editObj?.alarmSubType[u.value] : u.data.map(v => v.id))) || []}
+                           initValue={
+                              editObj?.id ?
+                                 editObj?.alarmSubType ?
+                                    editObj?.alarmSubType[u.value] : u.data.map(v => v.id)
+                                 : []}
                            direction='horizontal'
                            showClear
                         >