From b1e3fb3844560817049a6c4acdd21cb33252e18c Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Thu, 6 Jun 2024 14:48:32 +1000 Subject: [PATCH] =?UTF-8?q?fix(api):=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=87?= =?UTF-8?q?=D0=B8=D1=85=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=20=D0=B2=20Applic?= =?UTF-8?q?ationInWork?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.API/Controllers/V1/ApplicationInWorkController.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PARR.API/Controllers/V1/ApplicationInWorkController.cs b/PARR.API/Controllers/V1/ApplicationInWorkController.cs index d99ba263..bfb03fcd 100644 --- a/PARR.API/Controllers/V1/ApplicationInWorkController.cs +++ b/PARR.API/Controllers/V1/ApplicationInWorkController.cs @@ -194,11 +194,15 @@ namespace PARR.API.Controllers.V1 return BadRequest(new Response(resultValidate.Errors)); //уникальная запись по полям ApplicationId, WorkId у которой id!=[FromRoute]id - var existSameAiW = await applicationsInWorkService.Get().FirstOrDefaultAsync(t => t.Id != id && t.ApplicationId == request.ApplicationId && t.WorkId == request.WorkId); + var existSameAiW = await applicationsInWorkService.Get() + .FirstOrDefaultAsync(t => t.Id != id && t.ApplicationId == request.ApplicationId && t.WorkId == request.WorkId); if (existSameAiW != null) return BadRequest(new Response(false, new List { new ErrorModel { Message = "Задание на выполнение работ с такими ПО и работой уже существует" } })); - var orig = await applicationsInWorkService.GetAsync(id); + var orig = await applicationsInWorkService.Get() + .Include(t => t.WorkGroups) + .Include(t => t.EsppSchValues) + .FirstOrDefaultAsync(t => t.Id == id); if (orig == null) return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при изменении задания на выполнение работ. Не найдено задание с Id: {id}" } }));