Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

@@ -279,7 +279,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                     noticeTimely.msgSetting = JSON.stringify(map.msgSetting);
                     noticeTimely.msgSetting = JSON.stringify(map.msgSetting);
                 }
                 }
                 noticeTimely.templates = map.templates;
                 noticeTimely.templates = map.templates;
-                if (!noticeTimely.templates || map.msgSetting == '' || map.msgSetting == null) {
+                if (!noticeTimely.templates || noticeTimely.templates == '' || noticeTimely.templates == null) {
                     layer.msg('请配置自定义展示中的展示内容', {icon: 7, time: 3000});
                     layer.msg('请配置自定义展示中的展示内容', {icon: 7, time: 3000});
                     return false;
                     return false;
                 }
                 }
@@ -461,26 +461,27 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
             //获取模板和等级
             //获取模板和等级
             var obj = {
             var obj = {
                 msgSetting: '',
                 msgSetting: '',
-                templates: ''
+                templates: $('#notice_timely_param_sql').find('textarea[name="templates"]').eq(0).val()
             };
             };
 
 
             var errMsg = '';
             var errMsg = '';
 
 
             if (!$('#notice_timely_param_sql').hasClass('hide')) {
             if (!$('#notice_timely_param_sql').hasClass('hide')) {
                 // 获取模板信息
                 // 获取模板信息
-                var val = $('#notice_timely_param_sql').find('textarea[name="templates"]').eq(0).val();
+                var val = obj.templates;
                 if(!val || val == '' || val == null){
                 if(!val || val == '' || val == null){
                     var map = getRowName();
                     var map = getRowName();
-                    var pa = '';
+                    var exp = [];
+                    var templatesVal = '';
                     map.rowNameList.forEach(item => {
                     map.rowNameList.forEach(item => {
-                        pa += '#{' + item + '},';
+                        exp.push('#{' + item + '}')
                     })
                     })
-                    if (pa != '') {
-                        pa = pa.substring(0, pa.length - 1);
+
+                    if (exp.length > 0) {
+                        templatesVal = exp.join(",");
                     }
                     }
-                    val = pa;
+                    val = templatesVal;
                 }
                 }
-
                 obj.templates = val;
                 obj.templates = val;
 
 
                 var arr = [];
                 var arr = [];