瀏覽代碼

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

tangjiang 11 月之前
父節點
當前提交
380359d5a1
共有 1 個文件被更改,包括 12 次插入0 次删除
  1. 12 0
      src/Hotline.Application/FlowEngine/WorkflowApplication.cs

+ 12 - 0
src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -1062,6 +1062,18 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
                 return dto.NextHandlers.Select(d => WorkflowStepHandler.Create(workflow.Id, workflow.ExternalId,
                     assignType, orgId: d.Key, orgName: d.Value)).ToList();
             case EFlowAssignType.User:
+                if (!dto.NextHandlers.Any() && dto.HandlerType is EHandlerType.Role)
+                {
+                    var stepOption = await GetConfigStepAsync(EFlowType.Handle, nextStepDefine, cancellationToken);
+                    var uIds = stepOption.Items.Select(d => d.Key).ToList();
+                    var users1 = await _userRepository.Queryable()
+                        .Includes(d => d.Organization)
+                        .Where(d => uIds.Contains(d.Id))
+                        .ToListAsync(cancellationToken);
+                    return users1.Select(d => WorkflowStepHandler.Create(workflow.Id, workflow.ExternalId,
+                            assignType, d.Id, d.Name, d.OrgId, d.Organization.Name))
+                        .ToList();
+                }
                 var userIds = dto.NextHandlers.Select(d => d.Key).ToList();
                 var users = await _userRepository.Queryable()
                     .Includes(d => d.Organization)