diff --git a/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp b/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp index 279c6d0..77cd77d 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp @@ -61,7 +61,7 @@ font-weight: bold; } .modelBtns{ - margin-top:15px; + margin-top:40px; text-align: center; } .modelBtn{ @@ -310,11 +310,12 @@
- +
@@ -326,7 +327,7 @@
- +
diff --git a/power-admin/src/main/webapp/static/js/noticePage.js b/power-admin/src/main/webapp/static/js/noticePage.js index aa0ad0a..3608943 100644 --- a/power-admin/src/main/webapp/static/js/noticePage.js +++ b/power-admin/src/main/webapp/static/js/noticePage.js @@ -56,6 +56,9 @@ function loadTree(){ $(document).ready(function(){ loadTree(); fuzzySearch('treeDemo','#key',null,true,setting,zNodes); + $(".selectpicker").selectpicker({ + noneSelectedText: '请选择通知用户' //默认显示内容 + }); }); //添加通知类别 function addNoticeType(){ @@ -208,7 +211,7 @@ $("#parentId").change(function(){ var userName = $("#userName").val(); for (var i = 0; i < data.extend.userList.length; i++) { if (userName != data.extend.userList[i].userName) { - html += ''; + html += ''; } } } diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml index 6487a39..fc0e19e 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -484,7 +484,8 @@ power_user.user_name, power_user.user_tel, power_role.role_id, - power_role.role_name + power_role.role_name, + power_user.name FROM power_user LEFT JOIN power_user_dict ON power_user.user_id = power_user_dict.user_id @@ -579,7 +580,7 @@