Browse Source

Merge branch 'release/yibin' of http://git.12345lm.cn/Fengwo/hotline into release/yibin

Dun.Jason 9 months ago
parent
commit
d13ca95af8
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/Hotline.Api/Controllers/OrderController.cs

+ 4 - 4
src/Hotline.Api/Controllers/OrderController.cs

@@ -2868,7 +2868,7 @@ public class OrderController : BaseController
         var order = await _orderRepository.Queryable()
             .FirstAsync(d => d.WorkflowId == dto.WorkflowId, HttpContext.RequestAborted);
         if (order is null)
-            throw new UserFriendlyException("无效工单编号");
+            throw UserFriendlyException.SameMessage("无效工单编号");
         //if (await _orderDelayRepository.AnyAsync(x => x.OrderId == order.Id && x.DelayState == EDelayState.Examining, HttpContext.RequestAborted))
         //{
         //    throw UserFriendlyException.SameMessage("该工单存在正在审核中的延期,不能办理");
@@ -5159,7 +5159,7 @@ public class OrderController : BaseController
         if (order == null)
             throw new UserFriendlyException($"无效工单编号, orderId: {orderId}", "无效工单编号");
         if (order.IsSigned())
-            throw new UserFriendlyException("该工单已被签收");
+            throw UserFriendlyException.SameMessage("该工单已被签收");
         order.Sign(_sessionContext.RequiredUserId, _sessionContext.UserName);
         order.AutoAccept(_sessionContext.RequiredUserId, _sessionContext.UserName, _sessionContext.StaffNo);
 
@@ -5803,7 +5803,7 @@ public class OrderController : BaseController
                 .Where(d => d.ExternalId == orderId && d.Status != EWorkflowStepStatus.Handled)
                 .ToListAsync(HttpContext.RequestAborted);
             if (steps.Count > 1)
-                throw new UserFriendlyException("多个待办理节点暂不支持平移");
+                throw UserFriendlyException.SameMessage("多个待办理节点暂不支持平移");
             step = steps.First();
             if (step.BusinessType is not EBusinessType.Center and not EBusinessType.Send)
                 throw UserFriendlyException.SameMessage("当前办理节点非中心暂不支持平移");
@@ -5853,7 +5853,7 @@ public class OrderController : BaseController
                 .Includes(d => d.WorkflowTrace)
                 .FirstAsync(d => d.Id == dto.StepId, HttpContext.RequestAborted);
             if (step is null)
-                throw new UserFriendlyException("无效节点编号");
+                throw UserFriendlyException.SameMessage("无效节点编号");
             await _workflowDomainService.ChangeHandlerBatchAsync(new List<(string userId, string username, string orgId, string orgName, ICollection<WorkflowStep> steps)>
             {
                 new(dto.Handler.UserId,dto.Handler.Username,dto.Handler.OrgId,dto.Handler.OrgName, new List<WorkflowStep>{step})