修改角色

2023-07-06 11:36:11 +08:00
parent 2cf45830ff
commit f391667879
3 changed files with 28 additions and 17 deletions
@@ -187,14 +187,19 @@ func (r *Role) GetRole(c *gin.Context) {
 		return
 	}

-	// 获取角色身份
-	roleService := service.RoleService{}
-	isAdmin, err := roleService.GetRoleIden(c)
-	if err != nil {
+	// 获取角色数据
+	adminRoleDao := dao.AdminRoleDao{}
+	adminRole, err := adminRoleDao.GetAdminRoleFirstById(roleId)
+	if err != nil || adminRole == nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}

+	isAdmin := false
+	if adminRole.IsAdmin == 1 {
+		isAdmin = true
+	}
+
 	RoleService := service.RoleService{}
 	adminRole, menuIds, err := RoleService.GetRole(roleId, isAdmin)
 	if err != nil {