Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -1665,7 +1665,7 @@ public class OrderController : BaseController
             }
 
             //推省上
-            if (!string.IsNullOrEmpty(model.Id) && ("001170".Equals(order.CurrentHandleOrgCode) || "001177".Equals(order.CurrentHandleOrgCode)))
+            if (!string.IsNullOrEmpty(model.Id) && ("001170".Equals(model.OrgId) || "001177".Equals(model.OrgId)))
             {
                 var orderDto = _mapper.Map<OrderDto>(order);
                 var supervise = await _orderSuperviseRepository.GetAsync(x => x.Id == model.Id);
@@ -1722,7 +1722,7 @@ public class OrderController : BaseController
         await _orderSuperviseRepository.UpdateAsync(supervise, HttpContext.RequestAborted);
         var order = await _orderRepository.GetAsync(supervise.OrderId, HttpContext.RequestAborted);
         //推省上
-        if (order != null && ("001170".Equals(order.CurrentHandleOrgCode) || "001177".Equals(order.CurrentHandleOrgCode)))
+        if (order != null && ("001170".Equals(supervise.OrgId) || "001177".Equals(supervise.OrgId)))
         {
             var orderDto = _mapper.Map<OrderDto>(order);
             var superviseDto = _mapper.Map<SuperviseOrderDto>(supervise);
@@ -1768,7 +1768,7 @@ public class OrderController : BaseController
         await _orderSuperviseRepository.UpdateAsync(supervise, HttpContext.RequestAborted);
         var order = await _orderRepository.GetAsync(supervise.OrderId, HttpContext.RequestAborted);
         //推省上
-        if (order != null && ("001170".Equals(order.CurrentHandleOrgCode) || "001177".Equals(order.CurrentHandleOrgCode)))
+        if (order != null && ("001170".Equals(supervise.OrgId) || "001177".Equals(supervise.OrgId)))
         {
             var orderDto = _mapper.Map<OrderDto>(order);
             var superviseDto = _mapper.Map<SuperviseOrderDto>(supervise);
@@ -1906,7 +1906,7 @@ public class OrderController : BaseController
             }
 
             //推省上
-            if (!string.IsNullOrEmpty(model.Id) && ("001170".Equals(order.CurrentHandleOrgCode) || "001177".Equals(order.CurrentHandleOrgCode)))
+            if (!string.IsNullOrEmpty(model.Id) && ("001170".Equals(model.OrgId) || "001177".Equals(model.OrgId)))
             {
                 var orderDto = _mapper.Map<OrderDto>(order);
                 var urge = await _orderUrgeRepository.GetAsync(x => x.Id == model.Id);