|
@@ -482,7 +482,8 @@ public class TestController : BaseController
|
|
|
{
|
|
|
var steps = await _workflowStepRepository.Queryable()
|
|
|
.Includes(d => d.WorkflowTrace)
|
|
|
- .Where(d => d.FlowAssignType == null && d.Handlers.Count == 1)
|
|
|
+ .Where(d => d.FlowAssignType == null &&
|
|
|
+ SqlFunc.JsonArrayLength(d.Handlers) == 1)
|
|
|
.ToListAsync(HttpContext.RequestAborted);
|
|
|
//foreach (var step in steps)
|
|
|
//{
|
|
@@ -527,13 +528,16 @@ public class TestController : BaseController
|
|
|
{
|
|
|
var steps = await _workflowStepRepository.Queryable()
|
|
|
.Includes(d => d.WorkflowTrace)
|
|
|
- .Where(d => d.Status != EWorkflowStepStatus.Handled && d.HandlerId == null && d.Handlers.Any())
|
|
|
+ .Where(d => d.Status != EWorkflowStepStatus.Handled &&
|
|
|
+ d.HandlerId == null &&
|
|
|
+ d.FlowAssignType != null &&
|
|
|
+ SqlFunc.JsonArrayLength(d.Handlers) == 1)
|
|
|
.ToListAsync(HttpContext.RequestAborted);
|
|
|
|
|
|
foreach (var step in steps)
|
|
|
{
|
|
|
var handler = step.Handlers.First();
|
|
|
- if(step.FlowAssignType == EFlowAssignType.User)
|
|
|
+ if (step.FlowAssignType == EFlowAssignType.User)
|
|
|
{
|
|
|
step.HandlerId = handler.Key;
|
|
|
step.HandlerName = handler.Value;
|