修改超级管理员获取所有菜单

api/service/role.go

@@ -14,35 +14,39 @@ import (
 type RoleService struct{}
 
 // GetRoleMenuList 获取角色菜单
-func (r *RoleService) GetRoleMenuList(roleId int64) ([]*roleResponse.GetRoleMenuList, error) {
+func (r *RoleService) GetRoleMenuList(roleId int64, isAdmin bool) ([]*roleResponse.GetRoleMenuList, error) {
 	// 获取角色菜单
 	AdminRoleMenuDao := dao.AdminRoleMenuDao{}
-	adminRoleMenu, _ := AdminRoleMenuDao.GetAdminRoleMenuListByRoleId(roleId)
-	if adminRoleMenu == nil {
-		return []*roleResponse.GetRoleMenuList{}, nil
+	AdminMenuDao := dao.AdminMenuDao{}
+	var menuIDs []int64
+	var err error
+
+	if isAdmin {
+		// 超级管理员
+		menuIDs, err = AdminMenuDao.GetAdminMenuId()
+		if err != nil {
+			return []*roleResponse.GetRoleMenuList{}, nil
+		}
+	} else {
+		menuIDs, err = AdminRoleMenuDao.GetAdminRoleMenuIdByRoleId(roleId)
+		if err != nil {
+			return []*roleResponse.GetRoleMenuList{}, nil
+		}
 	}
 
 	// 获取全部正常菜单列表
-	AdminMenuDao := dao.AdminMenuDao{}
 	adminMenu, _ := AdminMenuDao.GetAdminMenuListNormalSortOrderNum()
 	if adminMenu == nil {
 		return []*roleResponse.GetRoleMenuList{}, nil
 	}
 
-	var menuIDs []int64
 	var menuTree []*roleResponse.GetRoleMenuList
 
-	if len(adminRoleMenu) > 0 {
-		for _, roleMenu := range adminRoleMenu {
-			menuIDs = append(menuIDs, roleMenu.MenuID)
-		}
-
-		if len(menuIDs) > 0 {
-			// 构建菜单树
-			menuTree = buildMenuTree(menuIDs, adminMenu)
-			if menuTree == nil {
-				return nil, nil
-			}
+	if len(menuIDs) > 0 {
+		// 构建菜单树
+		menuTree = buildMenuTree(menuIDs, adminMenu)
+		if menuTree == nil {
+			return nil, nil
 		}
 	}
 
@@ -388,3 +392,23 @@ func (r *RoleService) DeleteRole(c *gin.Context, DeleteRoleRequest requests.Dele
 
 	return true, nil
 }
+
+// GetRoleIden 获取角色身份
+func (r *RoleService) GetRoleIden(c *gin.Context) (bool, error) {
+	roleId := c.GetInt64("RoleId")
+	if roleId == 0 {
+		return false, errors.New("角色错误")
+	}
+
+	// 获取当前登陆接口角色数据
+	adminRoleDao := dao.AdminRoleDao{}
+	adminRole, err := adminRoleDao.GetAdminRoleFirstById(roleId)
+	if err != nil || adminRole == nil {
+		return false, errors.New("非法操作")
+	}
+
+	if adminRole.IsAdmin == 0 {
+		return false, nil
+	}
+	return true, nil
+}