diff --git a/LawCompany/LawCompanyBusinessLogic/BusinessLogics/HearingLogic.cs b/LawCompany/LawCompanyBusinessLogic/BusinessLogics/HearingLogic.cs index cb2fb95..3ec0394 100644 --- a/LawCompany/LawCompanyBusinessLogic/BusinessLogics/HearingLogic.cs +++ b/LawCompany/LawCompanyBusinessLogic/BusinessLogics/HearingLogic.cs @@ -95,6 +95,10 @@ namespace LawCompanyBusinessLogic.BusinessLogics { return false; } + if (element.HearingLawyers.ContainsKey(lawyer.Id)) + { + return false; + } element.HearingLawyers[lawyer.Id] = lawyer; _hearingStorage.Update(new() @@ -118,6 +122,10 @@ namespace LawCompanyBusinessLogic.BusinessLogics { return; } + if (string.IsNullOrEmpty(model.Judge)) + { + throw new ArgumentNullException("Не указан суд", nameof(model.Judge)); + } if (string.IsNullOrEmpty((model.HearingDate).ToString())) { throw new ArgumentNullException("Не поставлено время", nameof(model.HearingDate)); diff --git a/LawCompany/LawCompanyBusinessLogic/BusinessLogics/LawyerLogic.cs b/LawCompany/LawCompanyBusinessLogic/BusinessLogics/LawyerLogic.cs index d062877..45a71af 100644 --- a/LawCompany/LawCompanyBusinessLogic/BusinessLogics/LawyerLogic.cs +++ b/LawCompany/LawCompanyBusinessLogic/BusinessLogics/LawyerLogic.cs @@ -142,7 +142,6 @@ namespace LawCompanyBusinessLogic.BusinessLogics FIO = model.FIO, Phone = model.Phone, Email = model.Email, - GuarantorId = model.GuarantorId, }); if (element != null && element.Id != model.Id) diff --git a/LawCompany/LawCompanyDatabaseImplement/Implements/HearingStorage.cs b/LawCompany/LawCompanyDatabaseImplement/Implements/HearingStorage.cs index 8d70d34..10a3c8d 100644 --- a/LawCompany/LawCompanyDatabaseImplement/Implements/HearingStorage.cs +++ b/LawCompany/LawCompanyDatabaseImplement/Implements/HearingStorage.cs @@ -26,7 +26,7 @@ namespace LawCompanyDatabaseImplement.Implements { return new(); } - if (!model.GuarantorId.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) + if (model.GuarantorId.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) { using var context = new LawCompanyDatabase(); return context.Hearings @@ -37,7 +37,7 @@ namespace LawCompanyDatabaseImplement.Implements .Select(x => x.GetViewModel) .ToList(); } - if (!model.GuarantorId.HasValue) + else if (model.GuarantorId.HasValue) { using var context = new LawCompanyDatabase(); return context.Hearings