From 3fee68d5043392cab58276a4f13deef88c93b649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sat, 8 Jan 2022 21:47:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/Controllers/System/SysUserController.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs index 06384b1..b862ec1 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.IO; +using System.Linq; using ZR.Admin.WebApi.Filters; using ZR.Common; using ZR.Model; @@ -66,7 +67,8 @@ namespace ZR.Admin.WebApi.Controllers.System { Dictionary dic = new(); var roles = RoleService.SelectRoleAll(); - dic.Add("roles", SysUser.IsAdmin(userId) ? roles : roles.FindAll(f => !f.IsAdmin())); + dic.Add("roles", roles); + //dic.Add("roles", SysUser.IsAdmin(userId) ? roles : roles.FindAll(f => !f.IsAdmin())); dic.Add("posts", PostService.GetAll()); //编辑 @@ -75,7 +77,7 @@ namespace ZR.Admin.WebApi.Controllers.System SysUser sysUser = UserService.SelectUserById(userId); dic.Add("user", sysUser); dic.Add("postIds", UserPostService.GetUserPostsByUserId(userId)); - dic.Add("roleIds", RoleService.SelectUserRoles(userId)); + dic.Add("roleIds", sysUser.RoleIds); } return ToResponse(ApiResult.Success(dic));