src/Hotline.Api/Controllers/OrderController.cs

@@ -4066,16 +4066,16 @@ public class OrderController : BaseController
       NextWorkflowDto? flowDto, DateTime? expiredTime, bool isAutoFillSummaryOpinion, CancellationToken cancellation)
     {
         if (flowDto is null || !flowDto.NextHandlers.Any()) return;
-        var nextSteps = await _workflowDomainService.NextAsync(current, flowDto, expiredTime,
+        var unhandleSteps = await _workflowDomainService.NextAsync(current, flowDto, expiredTime,
             isAutoFillSummaryOpinion, cancellation);
 
-        foreach (var nextStep in nextSteps)
+        foreach (var unhandleStep in unhandleSteps)
         {
-            var nextStepHandlerOrgId = nextStep?.HandlerOrgId;
+            var nextStepHandlerOrgId = unhandleStep?.HandlerOrgId;
             if (string.IsNullOrEmpty(nextStepHandlerOrgId))
-                throw new UserFriendlyException($"数据异常, 待办部门id为空, stepId: {nextStep.Id}");
+                throw new UserFriendlyException($"数据异常, 待办部门id为空, stepId: {unhandleStep.Id}");
             var nextStepHandlerOrgLevel = nextStepHandlerOrgId.CalcOrgLevel();
-            var nextHandlers = orgs.Where(d => d.Level == nextStepHandlerOrgLevel && d.Id.StartsWith(nextStepHandlerOrgId))
+            var nextHandlers = orgs.Where(d => d.Level == nextStepHandlerOrgLevel+1 && d.Id.StartsWith(nextStepHandlerOrgId))
                 .Select(d => new FlowStepHandler
                 {
                     Key = d.Id,
@@ -4086,7 +4086,7 @@ public class OrderController : BaseController
                 .ToList();
             if (nextHandlers.Any())
             {
-                var nextStepDefine = definition.FindStepDefines(nextStep.NextSteps.Select(d => d.Code))
+                var nextStepDefine = definition.FindStepDefines(unhandleStep.NextSteps.Select(d => d.Code))
                     .FirstOrDefault(d =>
                         d.HandlerType == EHandlerType.OrgLevel &&
                         d.HandlerTypeItems.Any(x => x.Key == nextStepHandlerOrgLevel.ToString()));
@@ -4096,7 +4096,7 @@ public class OrderController : BaseController
                 var nextDto = new NextWorkflowDto
                 {
                     WorkflowId = flowDto.WorkflowId,
-                    StepId = nextStep.Id,
+                    StepId = unhandleStep.Id,
                     NextStepCode = nextStepDefine.Code,
                     NextStepName = nextStepDefine.Name,
                     FlowDirection = EFlowDirection.OrgToOrg,