Skip to content

Commit 4d6205b

Browse files
authored
Feat/get user roles (#1463)
* RoleSelectDto 增加 CreationTime 字段及相关适配 RoleSelectDto 类新增 CreationTime(创建时间)属性,移除无参构造函数,所有相关构造函数调用均需传入 CreationTime。同步调整 User.cs 和 QueryHandler.cs 中 RoleModel 及 RoleSelectDto 的创建逻辑,确保角色信息包含创建时间,便于前端展示和业务处理。 * 优化用户角色查询及数据结构 - 移除 RoleSelectDto 的 CreationTime 属性及相关参数,简化角色选择数据结构 - 新增 UserRoleDto 类,支持用户角色信息(编码、名称、绑定时间) - 新增 UserRolesQuery 查询对象,实现按用户ID查询角色列表 - QueryHandler 增加 GetUserRolesAsync 方法,完善角色查询逻辑 - UserService 新增 GetUserRolesAsync 接口,路由为 /{id}/roles - 补充部分文件的 Apache License 版权声明 - 提升用户角色相关功能的规范性和可维护性 * 移除RoleSelectDto中的creationTime参数及相关引用 本次提交移除了RoleSelectDto构造函数中的creationTime参数,并同步更新了所有相关的实例化调用。现在RoleSelectDto仅包含id、name、code、limit和availableQuantity字段,简化了数据结构。
1 parent 51caa5d commit 4d6205b

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

src/Contracts/Masa.Auth.Contracts.Admin/Permissions/RoleSelectDto.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ public RoleSelectDto(Guid id, string name, string code, int limit, int available
2222
Code = code;
2323
Limit = limit;
2424
AvailableQuantity = availableQuantity;
25-
CreationTime = creationTime;
2625
}
2726
}

src/Services/Masa.Auth.Service.Admin/Application/Permissions/QueryHandler.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public async Task GetRoleSelectAsync(RoleSelectQuery query)
188188
{
189189
var roleSelect = await _authDbContext.Set<Role>()
190190
.Where(r => r.Name.Contains(query.Name))
191-
.Select(r => new RoleSelectDto(r.Id, r.Name, r.Code, r.Limit, r.AvailableQuantity, r.CreationTime))
191+
.Select(r => new RoleSelectDto(r.Id, r.Name, r.Code, r.Limit, r.AvailableQuantity))
192192
.ToListAsync();
193193
query.Result = roleSelect;
194194
}
@@ -297,7 +297,7 @@ public async Task PermissionDetailQueryAsync(MenuPermissionDetailQuery menuPermi
297297
Order = permission.Order,
298298
Legend = permission.Legend,
299299
ApiPermissions = permission.AffiliationPermissionRelations.Select(pr => pr.AffiliationPermissionId).ToList(),
300-
Roles = permission.RolePermissions.Where(rp => rp.Effect).Select(rp => new RoleSelectDto(rp.Role.Id, rp.Role.Name, rp.Role.Code, rp.Role.Limit, rp.Role.AvailableQuantity, rp.Role.CreationTime)).ToList(),
300+
Roles = permission.RolePermissions.Where(rp => rp.Effect).Select(rp => new RoleSelectDto(rp.Role.Id, rp.Role.Name, rp.Role.Code, rp.Role.Limit, rp.Role.AvailableQuantity)).ToList(),
301301
Teams = permission.TeamPermissions.Where(rp => rp.Effect).DistinctBy(e => e.TeamId).Select(tp => new TeamSelectDto(tp.Team.Id, tp.Team.Name, tp.Team.Avatar.Url)).ToList(),
302302
Users = permission.UserPermissions.Where(rp => rp.Effect).Select(up => new UserSelectDto
303303
{

0 commit comments

Comments
 (0)