From 59f9d2a2f058bc22e696e85645fa0821b8fe4117 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 29 Apr 2024 18:49:50 +0000 Subject: [PATCH] case 4582 --- server/AyaNova/Controllers/UnitController.cs | 11 ++++++++--- server/AyaNova/biz/CustomerBiz.cs | 8 +++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/server/AyaNova/Controllers/UnitController.cs b/server/AyaNova/Controllers/UnitController.cs index aed995a7..79c66fc8 100644 --- a/server/AyaNova/Controllers/UnitController.cs +++ b/server/AyaNova/Controllers/UnitController.cs @@ -75,8 +75,8 @@ namespace AyaNova.Api.Controllers return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); UnitBiz biz = UnitBiz.GetBiz(ct, HttpContext); var customerEffectiveRights = await UserBiz.CustomerUserEffectiveRightsAsync(biz.UserId); - if (!customerEffectiveRights.CreateUnit) - return StatusCode(403, new ApiNotAuthorizedResponse()); + if (!customerEffectiveRights.CreateUnit) + return StatusCode(403, new ApiNotAuthorizedResponse()); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); @@ -309,7 +309,12 @@ namespace AyaNova.Api.Controllers { while (dr.Read()) { - ret.RecentWorkOrders.Add(new RecentWorkOrder(dr.GetInt64(0), dr.GetInt64(1), dr.GetDateTime(2))); + + if (!await dr.IsDBNullAsync(2))//case 4582 + ret.RecentWorkOrders.Add(new RecentWorkOrder(dr.GetInt64(0), dr.GetInt64(1), dr.GetDateTime(2))); + else + ret.RecentWorkOrders.Add(new RecentWorkOrder(dr.GetInt64(0), dr.GetInt64(1), null)); + } } } diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs index f3688fd6..819939bb 100644 --- a/server/AyaNova/biz/CustomerBiz.cs +++ b/server/AyaNova/biz/CustomerBiz.cs @@ -207,7 +207,7 @@ namespace AyaNova.Biz // internal async Task> GetContactNameListAsync(long customerId) { - return await ct.User.AsNoTracking().Where(z => z.Active && z.UserType == UserType.Customer && z.CustomerId == customerId).OrderBy(x => x.Name).Select(x=> x.Name).ToListAsync(); + return await ct.User.AsNoTracking().Where(z => z.Active && z.UserType == UserType.Customer && z.CustomerId == customerId).OrderBy(x => x.Name).Select(x => x.Name).ToListAsync(); } //////////////////////////////////////////////////////////////////////////////////////////////// @@ -427,7 +427,8 @@ namespace AyaNova.Biz if (await dr.ReadAsync()) { o.LastWorkOrderViz = dr.GetInt64(0); - o.LastServiceDateViz = dr.GetDateTime(1); + if (!await dr.IsDBNullAsync(1))//case 4582 + o.LastServiceDateViz = dr.GetDateTime(1); } @@ -445,7 +446,8 @@ namespace AyaNova.Biz if (await dr.ReadAsync()) { o.LastWorkOrderCompletedViz = dr.GetInt64(0); - o.LastServiceDateCompletedViz = dr.GetDateTime(1); + if (!await dr.IsDBNullAsync(1))//case 4582 + o.LastServiceDateCompletedViz = dr.GetDateTime(1); }