bug
This commit is contained in:
parent
474b0a8e3f
commit
ccb6ebf693
@ -15,6 +15,11 @@ public class SysUserPageOutput : KeyDto
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string Account { get; set; }
|
public string Account { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 关联角色Id列表(逗号分隔)
|
||||||
|
/// </summary>
|
||||||
|
public string RoleIds { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 关联角色名称(逗号分隔)
|
/// 关联角色名称(逗号分隔)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -71,7 +71,7 @@ public class SysUserService : BaseService<SysUser>, ITransient
|
|||||||
var userRoles = await _userRoleRepository.AsQueryable()
|
var userRoles = await _userRoleRepository.AsQueryable()
|
||||||
.InnerJoin<SysRole>((ur, r) => ur.RoleId == r.Id)
|
.InnerJoin<SysRole>((ur, r) => ur.RoleId == r.Id)
|
||||||
.Where((ur, r) => userIds.Contains(ur.UserId))
|
.Where((ur, r) => userIds.Contains(ur.UserId))
|
||||||
.Select((ur, r) => new { ur.UserId, RoleName = r.Name })
|
.Select((ur, r) => new { ur.UserId,r.Id, RoleName = r.Name })
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
foreach (var user in entityList.Rows)
|
foreach (var user in entityList.Rows)
|
||||||
@ -79,6 +79,8 @@ public class SysUserService : BaseService<SysUser>, ITransient
|
|||||||
var output = user.Adapt<SysUserPageOutput>();
|
var output = user.Adapt<SysUserPageOutput>();
|
||||||
var roles = userRoles.Where(x => x.UserId == user.Id).Select(x => x.RoleName).ToList();
|
var roles = userRoles.Where(x => x.UserId == user.Id).Select(x => x.RoleName).ToList();
|
||||||
output.RoleNames = string.Join(",", roles);
|
output.RoleNames = string.Join(",", roles);
|
||||||
|
var roleIds = userRoles.Where(x => x.UserId == user.Id).Select(x => x.Id).ToList();
|
||||||
|
output.RoleIds = string.Join(",", roleIds);
|
||||||
resultList.Add(output);
|
resultList.Add(output);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user