admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 4582

Browse Source
This commit is contained in:
John Cardinal
2024-04-29 18:49:50 +00:00
parent a8fb507616
commit 59f9d2a2f0
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/AyaNova/Controllers/UnitController.cs
View File

@@ -75,8 +75,8 @@ namespace AyaNova.Api.Controllers
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
UnitBiz biz = UnitBiz.GetBiz(ct, HttpContext); UnitBiz biz = UnitBiz.GetBiz(ct, HttpContext);
var customerEffectiveRights = await UserBiz.CustomerUserEffectiveRightsAsync(biz.UserId); var customerEffectiveRights = await UserBiz.CustomerUserEffectiveRightsAsync(biz.UserId);
if (!customerEffectiveRights.CreateUnit) if (!customerEffectiveRights.CreateUnit)
return StatusCode(403, new ApiNotAuthorizedResponse()); return StatusCode(403, new ApiNotAuthorizedResponse());
if (!ModelState.IsValid) if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState)); return BadRequest(new ApiErrorResponse(ModelState));
@@ -309,7 +309,12 @@ namespace AyaNova.Api.Controllers
{ {
while (dr.Read()) 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));
} }
} }
} }

8
server/AyaNova/biz/CustomerBiz.cs
View File

@@ -207,7 +207,7 @@ namespace AyaNova.Biz
// //
internal async Task<List<string>> GetContactNameListAsync(long customerId) internal async Task<List<string>> 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()) if (await dr.ReadAsync())
{ {
o.LastWorkOrderViz = dr.GetInt64(0); 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()) if (await dr.ReadAsync())
{ {
o.LastWorkOrderCompletedViz = dr.GetInt64(0); o.LastWorkOrderCompletedViz = dr.GetInt64(0);
o.LastServiceDateCompletedViz = dr.GetDateTime(1); if (!await dr.IsDBNullAsync(1))//case 4582
o.LastServiceDateCompletedViz = dr.GetDateTime(1);
} }