Merge branch 'LabWork07' into LabWork08

This commit is contained in:
Senju 2023-04-19 18:46:29 +04:00
commit 7e5a5ecce1

View File

@ -93,7 +93,7 @@ namespace IceCreamShopDatabaseImplement.Models
DateCreate = DateCreate, DateCreate = DateCreate,
DateImplement = DateImplement, DateImplement = DateImplement,
Id = Id, Id = Id,
IceCreamName = IceCream?.IceCreamName ?? string.Empty, IceCreamName = context.IceCreams.FirstOrDefault(x => x.Id == IceCreamId)?.IceCreamName ?? string.Empty,
ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty, ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
ClientFIO = Client?.ClientFIO ?? string.Empty, ClientFIO = Client?.ClientFIO ?? string.Empty,
}; };