src/Hotline.Api/Controllers/WorkflowController.cs

@@ -488,14 +488,14 @@ public class WorkflowController : BaseController
                         //todo
                         var users = await _userRepository.Queryable()
                             .Includes(d => d.Organization)
-                            .Where(d => step.AssignedHandlers.Select(x => x.Id).Contains(d.Id))
+                            .Where(d => step.Handlers.Select(x => x.Id).Contains(d.Id))
                             .ToListAsync(HttpContext.RequestAborted);
                         orgs.AddRange(users.Select(d => new Kv(d.OrgId, d.Organization.Name)));
                         break;
                     case EHandlerType.OrgLevel:
                     case EHandlerType.OrgType:
                     case EHandlerType.AssignedOrg:
-                        orgs.AddRange(step.AssignedHandlers);
+                        orgs.AddRange(step.Handlers);
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();

src/Hotline.Application/Mappers/WorkflowMapperConfigs.cs

@@ -20,7 +20,7 @@ public class WorkflowMapperConfigs : IRegister
             .Ignore(d => d.IsMain)
             .Ignore(d => d.Status)
             .Ignore(d => d.ParentId)
-            .Ignore(d => d.AssignedHandlers)
+            .Ignore(d => d.Handlers)
             .Ignore(d => d.Steps)
             .Ignore(d => d.StartCountersignId)
             .Ignore(d => d.CountersignId)

src/Hotline/FlowEngine/Workflows/StepBasicEntity.cs

@@ -58,7 +58,7 @@ public abstract class StepBasicEntity : CreationEntity
     /// 采用list类型，兼容多个办理对象可以办理同一个节点的场景
     /// </summary>
     [SugarColumn(ColumnDataType = "json", IsJson = true)]
-    public List<Kv> AssignedHandlers { get; set; } = new();
+    public List<Kv> Handlers { get; set; } = new();
 
     // /// <summary>
     // /// 办理时间限制(如：24小时、7个工作日)

src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -530,7 +530,7 @@ public partial class Workflow
         RemoveCurrentHandleGroup(handlerId, handlerOrg);
 
         var groupId = Guid.NewGuid().ToString();
-        var handlerObjects = prevStep.AssignedHandlers.Select(d => new HandlerGroupItem
+        var handlerObjects = prevStep.Handlers.Select(d => new HandlerGroupItem
         {
             StepId = groupId,
             Id = d.Id,

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -219,12 +219,12 @@ namespace Hotline.FlowEngine.Workflows
             if (currentStep.HandlerType is EHandlerType.AssignedUser or EHandlerType.Role)
             {
                 //userId
-                if (currentStep.AssignedHandlers.All(d => d.Id != userId)) return;
+                if (currentStep.Handlers.All(d => d.Id != userId)) return;
             }
             else
             {
                 //orgId
-                if (currentStep.AssignedHandlers.All(d => d.Id != orgCode)) return;
+                if (currentStep.Handlers.All(d => d.Id != orgCode)) return;
             }
             if (currentStep.StepType is EStepType.End)
                 throw new UserFriendlyException("当前流程已流转到最终步骤");
@@ -894,7 +894,7 @@ namespace Hotline.FlowEngine.Workflows
             newStep.PreviousStepId = step.PreviousStepId;
             newStep.IsMain = step.IsMain;
             newStep.ParentId = step.ParentId;
-            newStep.AssignedHandlers = step.AssignedHandlers;
+            newStep.Handlers = step.Handlers;
             newStep.StartCountersignId = step.StartCountersignId;
             newStep.CountersignId = step.CountersignId;
             newStep.IsStartedCountersignSummary = step.IsStartedCountersignSummary;
@@ -1377,7 +1377,7 @@ namespace Hotline.FlowEngine.Workflows
             {
                 foreach (var step in stepBox.Steps)
                 {
-                    if (predicate(step.Status) && (step.AssignedHandlers.Any(d => d.Id == orgCode) || step.AssignedHandlers.Any(d => d.Id == userId)))
+                    if (predicate(step.Status) && (step.Handlers.Any(d => d.Id == orgCode) || step.Handlers.Any(d => d.Id == userId)))
                         return (stepBox, step);
                 }
             }
@@ -1457,7 +1457,7 @@ namespace Hotline.FlowEngine.Workflows
             var isMain = handlers.Count == 1 || (handlers.Count > 1 || handlerIds.First() == nextMainHandler);
 
             step.ParentId = stepBox.Id;
-            step.AssignedHandlers = handlers;
+            step.Handlers = handlers;
             step.NextStepCode = step.StepType is EStepType.End ? string.Empty : nextStepCode;
             step.IsMain = isMain;
             step.PreviousStepId = prevStepId;

src/Hotline/FlowEngine/Workflows/WorkflowDomainService1.cs

@@ -219,12 +219,12 @@ namespace Hotline.FlowEngine.Workflows
             if (currentStep.HandlerType is EHandlerType.AssignedUser or EHandlerType.Role)
             {
                 //userId
-                if (currentStep.AssignedHandlers.All(d => d.Id != userId)) return;
+                if (currentStep.Handlers.All(d => d.Id != userId)) return;
             }
             else
             {
                 //orgId
-                if (currentStep.AssignedHandlers.All(d => d.Id != orgCode)) return;
+                if (currentStep.Handlers.All(d => d.Id != orgCode)) return;
             }
             if (currentStep.StepType is EStepType.End)
                 throw new UserFriendlyException("当前流程已流转到最终步骤");
@@ -894,7 +894,7 @@ namespace Hotline.FlowEngine.Workflows
             newStep.PreviousStepId = step.PreviousStepId;
             newStep.IsMain = step.IsMain;
             newStep.ParentId = step.ParentId;
-            newStep.AssignedHandlers = step.AssignedHandlers;
+            newStep.Handlers = step.Handlers;
             newStep.StartCountersignId = step.StartCountersignId;
             newStep.CountersignId = step.CountersignId;
             newStep.IsStartedCountersignSummary = step.IsStartedCountersignSummary;
@@ -1377,7 +1377,7 @@ namespace Hotline.FlowEngine.Workflows
             {
                 foreach (var step in stepBox.Steps)
                 {
-                    if (predicate(step.Status) && (step.AssignedHandlers.Any(d => d.Id == orgCode) || step.AssignedHandlers.Any(d => d.Id == userId)))
+                    if (predicate(step.Status) && (step.Handlers.Any(d => d.Id == orgCode) || step.Handlers.Any(d => d.Id == userId)))
                         return (stepBox, step);
                 }
             }
@@ -1457,7 +1457,7 @@ namespace Hotline.FlowEngine.Workflows
             var isMain = handlers.Count == 1 || (handlers.Count > 1 || handlerIds.First() == nextMainHandler);
 
             step.ParentId = stepBox.Id;
-            step.AssignedHandlers = handlers;
+            step.Handlers = handlers;
             step.NextStepCode = step.StepType is EStepType.End ? string.Empty : nextStepCode;
             step.IsMain = isMain;
             step.PreviousStepId = prevStepId;