From dc7da1b0956ebc1929bd1356f6839dfc3c6985eb Mon Sep 17 00:00:00 2001
From: samisgod <21gh@163.com>
Date: Fri, 17 Dec 2021 15:03:33 +0800
Subject: [PATCH] minor fix

---
 ZR.Service/System/SysRoleService.cs    | 14 +++++++++++++-
 ZR.Vue/src/views/system/role/index.vue |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

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
         /// <param name="role"></param>
         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");
         }
 
+        /// <summary>
+        /// 判断是否是管理员
+        /// </summary>
+        /// <param name="userid"></param>
+        /// <returns></returns>
+        public bool IsRoleAdmin(long roleid)
+        {
+            var roleInfo = GetFirst(x => x.RoleId == roleid);
+
+            return roleInfo.RoleKey == "admin";
+        }
+
         /// <summary>
         /// 获取角色菜单id集合
         /// </summary>
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;