From 2ee10e8e704639ad7a43acde9691deb3d408605e Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Mon, 21 Aug 2023 15:51:51 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
=?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=BE=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB?=
=?UTF-8?q?=D0=BA=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE?=
=?UTF-8?q?=D0=B2:=20=D0=B2=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20?=
=?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B4?=
=?UTF-8?q?=D0=BE=D0=BB=D0=B6=D0=BD=D1=8B=20=D0=BF=D0=BE=D0=BF=D0=B0=D0=B4?=
=?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20?=
=?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE?=
=?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Services/WellContactService.cs | 27 ++++++++++---------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/AsbCloudInfrastructure/Services/WellContactService.cs b/AsbCloudInfrastructure/Services/WellContactService.cs
index a8e280da..261ed9f9 100644
--- a/AsbCloudInfrastructure/Services/WellContactService.cs
+++ b/AsbCloudInfrastructure/Services/WellContactService.cs
@@ -29,18 +29,21 @@ namespace AsbCloudInfrastructure.Services
{
Caption = c.Caption,
Id = c.Id,
- Users = c.Users.Select(u => new UserContactDto()
- {
- Id = u.Id,
- Name = u.Name,
- Patronymic = u.Patronymic,
- Surname = u.Surname,
- Company = u.Company.Adapt<CompanyDto>(),
- Email = u.Email,
- Phone = u.Phone,
- Position = u.Position,
- IsContact = u.RelationContactsWells.Any(rel => rel.IdWell == wellId)
- })
+ Users = c.Users
+ .Where(u => u.IdState == 1)
+ .OrderBy(u => u.Surname)
+ .Select(u => new UserContactDto()
+ {
+ Id = u.Id,
+ Name = u.Name,
+ Patronymic = u.Patronymic,
+ Surname = u.Surname,
+ Company = u.Company.Adapt<CompanyDto>(),
+ Email = u.Email,
+ Phone = u.Phone,
+ Position = u.Position,
+ IsContact = u.RelationContactsWells.Any(rel => rel.IdWell == wellId)
+ })
});
var entities = await query.AsNoTracking()