From 0166fd5f8f24ff40fe857bbc040a2e94182e29a9 Mon Sep 17 00:00:00 2001 From: Danila_Mochalov Date: Sat, 22 Apr 2023 23:26:35 +0400 Subject: [PATCH 1/2] fix --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ca1c7a3..9485fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,4 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml +/LawFirm/ImplementationExtensions From a8f2d95d265895ce4cd76c8c510cf2d79205abef Mon Sep 17 00:00:00 2001 From: Danila_Mochalov Date: Sat, 22 Apr 2023 23:27:04 +0400 Subject: [PATCH 2/2] fix --- LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs | 3 ++- LawFirm/LawFirmDatabaseImplement/Models/Order.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs index 1fcae27..a5adf6f 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs @@ -63,7 +63,8 @@ namespace LawFirmBusinessLogic.BusinessLogics DateCreate = viewModel.DateCreate, DateImplement = viewModel.DateImplement, Count = viewModel.Count, - Sum = viewModel.Sum + Sum = viewModel.Sum, + ImplementerId = viewModel.ImplementerId }; if (rawModel.ImplementerId.HasValue) { diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs index c2c3801..a2f63bf 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs @@ -78,8 +78,8 @@ namespace LawFirmDatabaseImplement.Models DateImplement = DateImplement, Id = Id, Status = Status, - DocumentName = Document.DocumentName, - ClientFIO = Client.ClientFIO, + DocumentName = Document?.DocumentName ?? string.Empty, + ClientFIO = Client?.ClientFIO ?? string.Empty, ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty, }; }