Merge branch 'feature/orderhandle_2new_mode' into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -3619,8 +3619,7 @@ public class OrderController : BaseController
                 if (!orderHandleFlowDto.SelectedOrgs.Any())
                     throw new UserFriendlyException("跨级指派参数异常");
                 var orgIds = orderHandleFlowDto.SelectedOrgs
-                    .Where(d => !string.IsNullOrEmpty(d.OrgId))
-                    .SelectMany(d => d.OrgId!.GetHigherOrgIds(true))
+                    .Select(d => d.OrgId)
                     .ToList();
                 orgIds.Add(workflowDto.NextHandlers.First().OrgId);
                 var orgs = await _organizeRepository.Queryable()
@@ -3635,6 +3634,10 @@ public class OrderController : BaseController
                     var tempSteps = new List<WorkflowStep>();
                     foreach (var unhandleStep in unhandleSteps)
                     {
+                        var isAssignStep = orderHandleFlowDto.SelectedOrgs
+                            .First(d => d.OrgId == unhandleStep.HandlerOrgId).IsSelected;
+                        if(isAssignStep) continue;
+
                         var handleOrgs = orgs.Where(d => d.Level == i).ToList();
                         if (i != 1)
                             handleOrgs = handleOrgs.Where(d => d.Id.StartsWith(unhandleStep.HandlerOrgId)).ToList();