From 058d2db51e167a8304fea73f0e4f9bd0d669638b Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 22 Dec 2021 23:12:58 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/WorkOrderBiz.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 0c74adda..bb4f88e0 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -5132,9 +5132,22 @@ namespace AyaNova.Biz
         private async Task ScheduledUserPopulateVizFields(WorkOrderItemScheduledUser o)
         {
             if (o.UserId != null)
-                o.UserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync();
+            {
+                if (!vc.Has("user", o.UserId))
+                {
+                    vc.Add(await ct.User.AsNoTracking().Where(x => x.Id == o.UserId).Select(x => x.Name).FirstOrDefaultAsync(), "user", o.UserId);
+                }
+                o.UserViz = vc.Get("user", o.UserId);
+            }
+
             if (o.ServiceRateId != null)
-                o.ServiceRateViz = await ct.ServiceRate.AsNoTracking().Where(x => x.Id == o.ServiceRateId).Select(x => x.Name).FirstOrDefaultAsync();
+            {
+                if (!vc.Has("servicerate", o.ServiceRateId))
+                {
+                    vc.Add(await ct.ServiceRate.AsNoTracking().Where(x => x.Id == o.ServiceRateId).Select(x => x.Name).FirstOrDefaultAsync(), "servicerate", o.ServiceRateId);
+                }
+                o.ServiceRateViz = vc.Get("servicerate", o.ServiceRateId);
+            }           
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////