LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -54,7 +54,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
             {
                 return;
             }
-            await RunOrderInWork(implementer);
+            await RunOrderInWork(implementer, orders);
 
 			await Task.Run(() =>
 			{
@@ -98,28 +98,26 @@ namespace LawFirmBusinessLogic.BusinessLogics
 			});
         }
 
-        private async Task RunOrderInWork(ImplementerViewModel implementer)
+        private async Task RunOrderInWork(ImplementerViewModel implementer, List<OrderViewModel> allOrders)
         {
-			if (_orderLogic == null || implementer == null)
+            if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)
             {
                 return;
             }
             try
             {
-				var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
+                // Выбираем из всех заказов тот, который выполняется данным исполнителем
-				{
+                var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
-					ImplementerId = implementer.Id,
-					Status = OrderStatus.Выполняется
-				}));
                 if (runOrder == null)
                 {
                     return;
                 }
+
                 _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
                 // доделываем работу
                 Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
                 _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
-				_orderLogic.DeliveryOrder(new OrderBindingModel
+                _orderLogic.FinishOrder(new OrderBindingModel
                 {
                     Id = runOrder.Id
                 });
@@ -138,6 +136,5 @@ namespace LawFirmBusinessLogic.BusinessLogics
                 throw;
             }
         }
-
     }
 }

LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs

@@ -16,6 +16,10 @@ namespace LawFirmDatabaseImplement.Implements
     {
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
             using var context = new LawFirmDatabase();
             return context.Orders
                     .Include(x => x.Document)