告警合并提示优化

@@ -33,6 +33,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
 
 
         // 获取合并通知开关是否开启
         // 获取合并通知开关是否开启
         getNoticeMergeFlag();
         getNoticeMergeFlag();
+        let NoticeMergeFlag = 'off';
         function getNoticeMergeFlag(){
         function getNoticeMergeFlag(){
             admin.req({
             admin.req({
                 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
                 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
@@ -41,6 +42,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
                 , success: function (res) {
                 , success: function (res) {
                     $.each(res.data, function (i, v) {
                     $.each(res.data, function (i, v) {
                         if(v.ddicCode == 'on'){
                         if(v.ddicCode == 'on'){
+                            NoticeMergeFlag= 'on';
                             $('#noticeMergeTab').show();
                             $('#noticeMergeTab').show();
                         }
                         }
                     });
                     });
@@ -231,14 +233,17 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
                 return false;
                 return false;
             }
             }
 
 
-            if(!data.alarmContentExpr || data.alarmContentExpr == ''){
-                layer.msg("请先填写告警内容描述表达式！", {
-                    icon: 7
-                    , time: 3000
-                });
-                return false;
+            if(NoticeMergeFlag && NoticeMergeFlag == 'on'){
+                if(!data.alarmContentExpr || data.alarmContentExpr == ''){
+                    layer.msg("请先填写告警内容描述表达式！", {
+                        icon: 7
+                        , time: 3000
+                    });
+                    return false;
+                }
             }
             }
 
 
+
             var importantPolicy = data.seriousPolicy;
             var importantPolicy = data.seriousPolicy;
             var importantExpr = data.importantPolicy;
             var importantExpr = data.importantPolicy;
             var commonlyPolicy = data.commonlyPolicy;
             var commonlyPolicy = data.commonlyPolicy;