manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增系统管理员管理默认角色不能取消提示

Browse Source
This commit is contained in:
jeesite
2022-01-11 12:39:56 +08:00
parent 19b9cd8205
commit 3c698cf6ad
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
View File

@@ -93,7 +93,10 @@ public class CorpAdminController extends BaseController {
// 获取当前用户所拥有的角色 // 获取当前用户所拥有的角色
Role role = new Role(); Role role = new Role();
role.setUserCode(user.getUserCode()); role.setUserCode(user.getUserCode());
model.addAttribute("roleList", roleService.findListByUserCode(role)); List<Role> roleList = roleService.findListByUserCode(role);
roleList.add(new Role(Role.CORP_ADMIN_ROLE_CODE));
model.addAttribute("roleList", roleList);
model.addAttribute("corpAdminRoleCode", Role.CORP_ADMIN_ROLE_CODE);
// 操作类型：addCorp: 添加租户； addAdmin: 添加管理员； edit: 编辑 // 操作类型：addCorp: 添加租户； addAdmin: 添加管理员； edit: 编辑
model.addAttribute("op", op); model.addAttribute("op", op);
model.addAttribute("user", user); model.addAttribute("user", user);

12
modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
View File

@@ -190,6 +190,18 @@ var roleGrid = $("#roleGrid").dataGrid({
autoGridWidth: function(){ autoGridWidth: function(){
return $('#inputForm .box-body').width()-20; return $('#inputForm .box-body').width()-20;
}, },
onSelectRow: function(id, isSelect, event){
if (!isSelect && id == '${corpAdminRoleCode}') {
js.showMessage('${text("该角色为管理员默认，不能取消。")}');
}
},
onSelectAll: function(ids, isSelect){
for (var i=0; i<ids.length; i++){
if (!isSelect && ids[i] == '${corpAdminRoleCode}') {
js.showMessage('${text("该角色为管理员默认，不能取消。")}');
}
}
},
ajaxSuccess: function(){ ajaxSuccess: function(){
<% for (role in roleList!){ %> <% for (role in roleList!){ %>
roleGrid.dataGrid('setSelectRow', '${role.roleCode}'); roleGrid.dataGrid('setSelectRow', '${role.roleCode}');