diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index 04e3caa0..93c096f0 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -93,7 +93,10 @@ public class CorpAdminController extends BaseController { // 获取当前用户所拥有的角色 Role role = new Role(); role.setUserCode(user.getUserCode()); - model.addAttribute("roleList", roleService.findListByUserCode(role)); + List 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: 编辑 model.addAttribute("op", op); model.addAttribute("user", user); diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html index 10557bb0..fc03a02a 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html @@ -190,6 +190,18 @@ var roleGrid = $("#roleGrid").dataGrid({ autoGridWidth: function(){ 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 roleGrid.dataGrid('setSelectRow', '${role.roleCode}');