From a1e936c3c14b9ab2ac4cef825284a5574546055b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 6 Sep 2021 22:35:42 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/PartController.cs | 2 +- server/AyaNova/biz/ServiceRateBiz.cs | 2 +- server/AyaNova/biz/TravelRateBiz.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/AyaNova/Controllers/PartController.cs b/server/AyaNova/Controllers/PartController.cs index 9056a9e9..d74dbd33 100644 --- a/server/AyaNova/Controllers/PartController.cs +++ b/server/AyaNova/Controllers/PartController.cs @@ -313,7 +313,7 @@ namespace AyaNova.Api.Controllers return StatusCode(403, new ApiNotAuthorizedResponse()); // if (!ModelState.IsValid) // return BadRequest(new ApiErrorResponse(ModelState)); - var o = await ct.Part.AsNoTracking().Select(x => x.UnitOfMeasure).Distinct().OrderBy(x => x).ToListAsync(); + var o = await ct.Part.AsNoTracking().Select(x => x.UnitOfMeasure).Where(x => x != null).Distinct().OrderBy(x => x).ToListAsync(); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); return Ok(ApiOkResponse.Response(o)); } diff --git a/server/AyaNova/biz/ServiceRateBiz.cs b/server/AyaNova/biz/ServiceRateBiz.cs index f2b6e61d..5922d9f1 100644 --- a/server/AyaNova/biz/ServiceRateBiz.cs +++ b/server/AyaNova/biz/ServiceRateBiz.cs @@ -182,7 +182,7 @@ namespace AyaNova.Biz // internal async Task> GetPriorUnitsAsync() { - return await ct.ServiceRate.AsNoTracking().Select(x => x.Unit).Distinct().OrderBy(x => x).ToListAsync(); + return await ct.ServiceRate.AsNoTracking().Select(x => x.Unit).Where(x => x != null).Distinct().OrderBy(x => x).ToListAsync(); } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/biz/TravelRateBiz.cs b/server/AyaNova/biz/TravelRateBiz.cs index 8da140e6..1ef46d96 100644 --- a/server/AyaNova/biz/TravelRateBiz.cs +++ b/server/AyaNova/biz/TravelRateBiz.cs @@ -182,7 +182,7 @@ namespace AyaNova.Biz // internal async Task> GetPriorUnitsAsync() { - return await ct.TravelRate.AsNoTracking().Select(x => x.Unit).Distinct().OrderBy(x => x).ToListAsync(); + return await ct.TravelRate.AsNoTracking().Select(x => x.Unit).Where(x => x != null).Distinct().OrderBy(x => x).ToListAsync(); } ////////////////////////////////////////////////////////////////////////////////////////////////