power2.0
/
power_cz
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改添加通知，显示用户多显示姓名

Browse Source
master
zengwh 5 years ago
parent c73812a09f
commit aaef344a2b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File

7
power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp
Unescape Escape View File

@ -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>

5
power-admin/src/main/webapp/static/js/noticePage.js
Unescape Escape View File

@ -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>';
}
}
}

5
power-dao/src/main/resources/mapper/Power_UserMapper.xml
Unescape Escape View File

@ -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>
<!--批量插入-->

Write Preview
Loading…
Cancel
Save