通知查询-【无】管理员默认查询全部

@@ -219,11 +219,11 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
                                 async: false,
                                 success: function (data) {
                                     sessionStorage.setItem("isNewPwd", data.isNewPwd);
-                                    var roles = $.map(data.sysRoles, function (e) {
-                                        return e.code;
+                                    var roles = data.sysRoles.map(item=> {
+                                        return item.code
                                     })
                                     sessionStorage.setItem('permissions', data.permissions);
-                                    sessionStorage.setItem('roles', roles);
+                                    sessionStorage.setItem('roles', roles.join(','));
                                     sessionStorage.setItem('user_id', data.id);  //保存用户id  joke add 20211206
                                     localStorage.setItem('user_id', data.id);  //保存用户id  lsq add 2022-03-31
                                     // Start Wang 2022/2/8 15:37 用户登录后，获取用户信息时，增加获取用户扩展信息

@@ -46,6 +46,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         form.render();
 
         getChartData();
+        userList();
         //渲染表格
         var noticeTable = table.render({
             elem: '#noticeSearchTable'
@@ -152,6 +153,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             strict: false,
                             indent: 20
                         },
+                        toolbar: {
+                            show: true,
+                            list: ['CLEAR']
+                        },
                         model: {
                             label: {
                                 type: 'text'
@@ -171,7 +176,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             reloadData();
                         }
                     });
-                }else {
+                } else {
                     $('#notice_user_list_div').hide();
                 }
                 if (userSelect) {
@@ -209,6 +214,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                                 type: 'text'
                             }
                         },
+                        toolbar: {
+                            show: true,
+                            list: ['CLEAR']
+                        },
                         prop: {
                             name: 'busTypeName',
                             value: 'busId'
@@ -263,6 +272,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             strict: false,
                             indent: 20
                         },
+                        toolbar:{
+                            show: true,
+                            list: ['CLEAR']
+                        },
                         model: {
                             label: {
                                 type: 'text'
@@ -292,6 +305,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             }
         });
 
+        function userList() {
+            let roles = sessionStorage.getItem("roles");
+            if (roles.indexOf('ADMIN') == -1){
+                $('#notice_user_list_div').hide();
+            }
+        }
+
         //刷新表格
         function reloadTable() {
             noticeTable.reload({