on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

правка опечаток и "мусора" после дебага

Browse Source
This commit is contained in:
eugeniy_ivanov 2023-02-06 21:56:27 +05:00
parent 973f1afb1b
commit 54178e8923
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AsbCloudInfrastructure/Repository/UserRepository.cs
View File

@ -59,13 +59,11 @@ namespace AsbCloudInfrastructure.Repository
public async Task<IEnumerable<UserExtendedDto>> GetAllAsync(CancellationToken token) public async Task<IEnumerable<UserExtendedDto>> GetAllAsync(CancellationToken token)
{ {
var dtos = (await GetCacheUserAsync(token)).ToList(); var dtos = (await GetCacheUserAsync(token)).ToList();
var listDtos = dtos.ToList();
if (dtos is null) if (dtos is null)
return Enumerable.Empty<UserExtendedDto>(); return Enumerable.Empty<UserExtendedDto>();
for (var i = 0; i < dtos.Count; i++)
for (var i = 0; i < listDtos.Count; i++) dtos[i].RoleNames = GetRolesNamesByIdUser(dtos[i].Id);
listDtos[i].RoleNames = GetRolesNamesByIdUser(listDtos[i].Id);
return dtos; return dtos;
} }
@ -301,7 +299,7 @@ namespace AsbCloudInfrastructure.Repository
protected virtual User Convert(UserExtendedDto dto) protected virtual User Convert(UserExtendedDto dto)
{ {
var entity = dto.Adapt<User>(userTypeAdapterConfig); var entity = dto.Adapt<User>(userTypeAdapterConfig);
if (string.IsNullOrEmpty(entity.PasswordHash)) if (string.IsNullOrEmpty(entity.PasswordHash))
entity.PasswordHash = dbContext.Users.FirstOrDefault(u => u.Id == dto.Id)?.PasswordHash; entity.PasswordHash = dbContext.Users.FirstOrDefault(u => u.Id == dto.Id)?.PasswordHash;
return entity; return entity;