瀏覽代碼

Merge branch 'release/yibin' of http://110.188.24.182:10023/Fengwo/hotline into release/yibin

xf 10 月之前
父節點
當前提交
cb2a0d97b4
共有 2 個文件被更改,包括 9 次插入1 次删除
  1. 2 1
      src/Hotline.Api/Controllers/OrderController.cs
  2. 7 0
      src/Hotline/Orders/OrderSendBackAudit.cs

+ 2 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -3105,7 +3105,8 @@ public class OrderController : BaseController
                     SendBackOrgId = prevStep.HandlerOrgId,//prevStep.AcceptorOrgId,
                     SendBackOrgName = prevStep.HandlerOrgName,//prevStep!.AcceptorOrgName,
                     WorkflowOrgId = _sessionContext.RequiredOrgId,
-                    WorkflowUserId = _sessionContext.RequiredUserId
+                    WorkflowUserId = _sessionContext.RequiredUserId,
+                    WorkflowRoleId =  _sessionContext.Roles.ToList()
                 };
                 await _orderSendBackAuditRepository.AddAsync(audit, HttpContext.RequestAborted);
             }

+ 7 - 0
src/Hotline/Orders/OrderSendBackAudit.cs

@@ -99,5 +99,12 @@ namespace Hotline.Orders
 		/// </summary>
 		[SugarColumn(ColumnDescription = "流程退回发起用户ID")]
 		public string WorkflowUserId { get; set; }
+
+
+		/// <summary>
+		/// 流程退回发起用户角色ID
+		/// </summary>
+		[SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true, ColumnDescription = "流程退回发起用户角色ID")]
+		public List<string> WorkflowRoleId { get; set; }
 	}
 }