src/Hotline.Api/Controllers/OrderController.cs

@@ -4228,8 +4228,8 @@ public class OrderController : BaseController
                 IsScreen = d.OrderScreens.Any(x => x.Status == EScreenStatus.End),
                 TerminateStatus = d.OrderTerminates.OrderByDescending(p => p.CreationTime).Select(p => p.Status).FirstOrDefault()
             }, true)
-           .MergeTable()
-           .OrderByIF(_appOptions.Value.IsZiGong, d => d.TerminateStatus, OrderByType.Desc)
+           //.MergeTable()
+           //.OrderByIF(_appOptions.Value.IsZiGong, d => d.TerminateStatus, OrderByType.Desc)
             .OrderByDescending(d => d.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderHistoryOutDto>(total, _mapper.Map<IReadOnlyList<OrderHistoryOutDto>>(items));