diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Order.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Order.cs index d5f1a38..33af5ec 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Order.cs @@ -62,7 +62,6 @@ namespace SoftwareInstallationListImplement.Models PackageId = PackageId, ClientId = ClientId, ImplementerId = ImplementerId, - ImplementerFIO = DataListSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty, Count = Count, Sum = Sum, Status = Status, diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationListImplement/OrderStorage.cs index 91b4b27..e178ae0 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/OrderStorage.cs @@ -137,6 +137,14 @@ namespace SoftwareInstallationListImplement.Implements break; } } + foreach (var implement in _source.Implementers) + { + if (implement.Id == res.ImplementerId) + { + res.ClientFIO = implement.ImplementerFIO; + break; + } + } return res; } }