From aaef344a2b1e3cdb943bd30e5fef4ebad1fd05dd Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Thu, 6 Aug 2020 10:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E5=A4=9A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp | 7 ++++---
 power-admin/src/main/webapp/static/js/noticePage.js        | 5 ++++-
 power-dao/src/main/resources/mapper/Power_UserMapper.xml   | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

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 @@
                     </div>
                     <div class="formDiv" style="height:47px;">
                         <label  class="control-label left">通知内容：</label>
-                        <textarea  class="form-control input input-sm" id="noticeContent" name="noticeContent"></textarea>
+                        <textarea class="form-control input input-sm" id="noticeContent" name="noticeContent" style="resize: none;"></textarea>
                     </div>
                     <div class="formDiv">
                         <label  class="control-label left">接收人：</label>
                         <select class="selectpicker form-control input input-sm" multiple name="noticeReceive" id="noticeReceive" data-live-search="true" data-actions-box="true">
+                            <option value="">请选择通知用户</option>
                         </select>
                     </div>
                     <div class="formDiv">
@@ -326,7 +327,7 @@
                     </div>
                     <div class="formDiv">
                         <label  class="control-label left">备注：</label>
-                        <textarea class="form-control input input-sm" id="remark" name="remark"></textarea>
+                        <textarea class="form-control input input-sm" id="remark" name="remark" style="resize: none;height: 90px"></textarea>
                     </div>
                 </form>
             </div>
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 += '<option value="' + data.extend.userList[i].userId + '">' + data.extend.userList[i].userName + '</option>';
+								html += '<option value="' + data.extend.userList[i].userId + '">' + data.extend.userList[i].userName + '-'+ data.extend.userList[i].name + '</option>';
 							}
 						}
 					}
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 @@
     </select>
     <!--全查非admin-->
     <select id="selectAllNotAdmin" resultMap="BaseResultMapVo">
-        SELECT user_id,user_name FROM power_user WHERE effective = 1 AND role_id != 0
+        SELECT user_id,user_name,name FROM power_user WHERE effective = 1 AND role_id != 0
     </select>
 
   <!--批量插入-->