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

src/Hotline.Application/Handlers/FlowEngine/WorkflowNextHandler.cs

@@ -158,7 +158,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
                 if (screen != null)
                 {
                     screen.Status = EScreenStatus.Approval;
-                    screen.Assign(assignInfo.FlowAssignType, assignInfo.GetHandlerIds());
+                    screen.Assign(workflow.FlowedOrgIds, workflow.FlowedUserIds);
                     await _orderScreenRepository.UpdateAsync(screen, cancellationToken);
                 }
 
@@ -207,7 +207,7 @@ public class WorkflowNextHandler : INotificationHandler<NextStepNotify>
                     .Where(x => x.Id == workflow.ExternalId).FirstAsync(cancellationToken);
                 if (orderDelay != null)
                 {
-                    orderDelay.Assign(assignInfo.FlowAssignType, assignInfo.GetHandlerIds());
+                    orderDelay.Assign(workflow.FlowedOrgIds, workflow.FlowedUserIds);
                     await _orderDelayRepository.UpdateAsync(orderDelay, cancellationToken);
                 }
 

src/XF.Domain.Repository/Entity.cs

@@ -191,6 +191,12 @@ public abstract class WorkflowEntity : FullStateEntity, IWorkflow
                 throw new ArgumentOutOfRangeException(nameof(type), type, null);
         }
     }
+
+    public void Assign(List<string> flowedOrgIds, List<string> flowedUserIds)
+    {
+        FlowedOrgIds = flowedOrgIds;
+        FlowedUserIds = flowedUserIds;
+    }
 }
 
 public abstract class PositionEntity : FullStateEntity