diff --git a/SeaHaven.DataServices/Implementation/ContactDataService.cs b/SeaHaven.DataServices/Implementation/ContactDataService.cs index e4abf4f..acd7e88 100644 --- a/SeaHaven.DataServices/Implementation/ContactDataService.cs +++ b/SeaHaven.DataServices/Implementation/ContactDataService.cs @@ -130,15 +130,15 @@ namespace SeaHaven.DataServices.Implementation public async Task EmailExistsAsync(string email, int? excludeId = null) { - return await _context.Contacts.AnyAsync(c => - c.Email == email && + return await _context.Contacts.AnyAsync(c => + c.Email == email && (excludeId == null || c.Id != excludeId)); } public async Task PhoneExistsAsync(string phone, int? excludeId = null) { - return await _context.Contacts.AnyAsync(c => - c.PhoneNumber == phone && + return await _context.Contacts.AnyAsync(c => + c.PhoneNumber == phone && (excludeId == null || c.Id != excludeId)); } diff --git a/SeaHaven.DataServices/Implementation/PMScheduleDataService.cs b/SeaHaven.DataServices/Implementation/PMScheduleDataService.cs index 6bc925a..1ce854f 100644 --- a/SeaHaven.DataServices/Implementation/PMScheduleDataService.cs +++ b/SeaHaven.DataServices/Implementation/PMScheduleDataService.cs @@ -46,8 +46,8 @@ namespace SeaHaven.DataServices.Implementation } public async Task<(IEnumerable Items, int TotalCount)> GetPagedAsync( - int page, - int pageSize, + int page, + int pageSize, string? search = null) { var query = _context.PMSchedules.AsQueryable();