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

Merge pull request 'Доработка по модалке контактов: в список контактов должны попадать только активные пользователи' () from fix/well-contacts-rework into dev

Browse Source 
Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/102
This commit is contained in:
Никита Фролов 2023-09-06 15:12:51 +05:00
commit 3369483ee6
1 changed files with 15 additions and 12 deletions

27
AsbCloudInfrastructure/Services/WellContactService.cs
View File

@ -29,18 +29,21 @@ namespace AsbCloudInfrastructure.Services
{ {
Caption = c.Caption, Caption = c.Caption,
Id = c.Id, Id = c.Id,
Users = c.Users.Select(u => new UserContactDto() Users = c.Users
{ .Where(u => u.IdState == 1)
Id = u.Id, .OrderBy(u => u.Surname)
Name = u.Name, .Select(u => new UserContactDto()
Patronymic = u.Patronymic, {
Surname = u.Surname, Id = u.Id,
Company = u.Company.Adapt<CompanyDto>(), Name = u.Name,
Email = u.Email, Patronymic = u.Patronymic,
Phone = u.Phone, Surname = u.Surname,
Position = u.Position, Company = u.Company.Adapt<CompanyDto>(),
IsContact = u.RelationContactsWells.Any(rel => rel.IdWell == wellId) Email = u.Email,
}) Phone = u.Phone,
Position = u.Position,
IsContact = u.RelationContactsWells.Any(rel => rel.IdWell == wellId)
})
}); });
var entities = await query.AsNoTracking() var entities = await query.AsNoTracking()