diff --git a/ZR.Service/System/SysRoleService.cs b/ZR.Service/System/SysRoleService.cs index d04a820..026b55d 100644 --- a/ZR.Service/System/SysRoleService.cs +++ b/ZR.Service/System/SysRoleService.cs @@ -121,7 +121,7 @@ namespace ZR.Service /// public void CheckRoleAllowed(SysRole role) { - if (IsAdmin(role.RoleId)) + if (IsRoleAdmin(role.RoleId)) { throw new CustomException("不允许操作超级管理员角色"); } @@ -191,6 +191,18 @@ namespace ZR.Service return ((IList)roles).Contains("admin"); } + /// + /// 判断是否是管理员 + /// + /// + /// + public bool IsRoleAdmin(long roleid) + { + var roleInfo = GetFirst(x => x.RoleId == roleid); + + return roleInfo.RoleKey == "admin"; + } + /// /// 获取角色菜单id集合 /// diff --git a/ZR.Vue/src/views/system/role/index.vue b/ZR.Vue/src/views/system/role/index.vue index 7d0a4ec..cda157d 100644 --- a/ZR.Vue/src/views/system/role/index.vue +++ b/ZR.Vue/src/views/system/role/index.vue @@ -439,7 +439,7 @@ export default { }); } else { this.form.type = "add"; - this.form.menuIds = this.getMenuAllCheckedKeys(); + //this.form.menuIds = this.getMenuAllCheckedKeys(); addRole(this.form).then((response) => { console.log(response); this.open = false;