diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs index bb310ac..87d0576 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -56,11 +56,10 @@ namespace ZR.Admin.WebApi.Controllers.System long userId = HttpContext.GetUId(); var user = UserService.SelectUserById(userId); - user.Roles = RoleService.SelectUserRoleListByUserId(userId); var roles = RoleService.SelectUserRoleNames(userId); var postGroup = UserPostService.GetPostsStrByUserId(userId); var deptInfo = DeptService.GetFirst(f => f.DeptId == user.DeptId); - user.DeptName = deptInfo?.DeptName; + user.DeptName = deptInfo?.DeptName ?? "-"; return SUCCESS(new { user, roles, postGroup }, TIME_FORMAT_FULL); } diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs index f26d399..06384b1 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs @@ -5,16 +5,12 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using OfficeOpenXml; -using System; using System.Collections.Generic; using System.IO; -using System.Reflection; using ZR.Admin.WebApi.Filters; using ZR.Common; using ZR.Model; using ZR.Model.System; -using ZR.Service; using ZR.Service.System.IService; namespace ZR.Admin.WebApi.Controllers.System diff --git a/ZR.Model/System/SysUser.cs b/ZR.Model/System/SysUser.cs index 7a19ae6..3adb5d7 100644 --- a/ZR.Model/System/SysUser.cs +++ b/ZR.Model/System/SysUser.cs @@ -99,7 +99,7 @@ namespace ZR.Model.System /// [SugarColumn(IsIgnore = true)] [EpplusIgnore] - public int[] RoleIds { get; set; } + public long[] RoleIds { get; set; } /// /// 岗位集合 /// diff --git a/ZR.Service/System/SysUserService.cs b/ZR.Service/System/SysUserService.cs index 1230763..e856c61 100644 --- a/ZR.Service/System/SysUserService.cs +++ b/ZR.Service/System/SysUserService.cs @@ -51,7 +51,12 @@ namespace ZR.Service /// public SysUser SelectUserById(long userId) { - return UserRepository.SelectUserById(userId); + var user = UserRepository.SelectUserById(userId); + if (user != null && user.UserId > 0) + { + user.Roles = RoleService.SelectUserRoleListByUserId(userId); + } + return user; } ///