Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -4217,7 +4217,7 @@ public class OrderController : BaseController
 
         var (total, items) = await query
             .Includes(d => d.OrderScreens)
-            .Includes(d => d.OrderTerminates)
+            //.Includes(d => d.OrderTerminates)
             .Where(d => d.Contact == dto.PhoneNo)
             .WhereIF(_sessionContext.OrgIsCenter == false && (_appOptions.Value.IsYiBin == true || _appOptions.Value.IsLuZhou == true),
                 d => d.IsSecret == false)
@@ -4225,11 +4225,18 @@ public class OrderController : BaseController
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
             .Select(d => new OrderHistoryOutDto
             {
+                Id = d.Id,
+                Title = d.Title,
+                No = d.No,
+                CurrentStepName = d.CurrentStepName,
+                CreationTime = d.CreationTime,
+                ActualHandleOrgName = d.ActualHandleOrgName,
+                Status = d.Status,
                 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)
+                TerminateStatus = SqlFunc.Subqueryable<OrderTerminate>().Where(s => s.OrderId == d.Id).OrderByDesc(s => s.CreationTime).Select(s => s.Status)
+            })
+            .MergeTable()
+            .OrderByIF(_appOptions.Value.IsZiGong, d => d.TerminateStatus, OrderByType.Asc)
             .OrderByDescending(d => d.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderHistoryOutDto>(total, _mapper.Map<IReadOnlyList<OrderHistoryOutDto>>(items));