diff --git a/ZhongLian/ZhongLianService/InstallService.cs b/ZhongLian/ZhongLianService/InstallService.cs index b5de5ab..3b0e38b 100644 --- a/ZhongLian/ZhongLianService/InstallService.cs +++ b/ZhongLian/ZhongLianService/InstallService.cs @@ -313,9 +313,10 @@ namespace ZhongLianService .WhereIF(pageSearch.Mode != null && !string.IsNullOrEmpty(pageSearch.Mode.PatrolUid), x => x.PatrolUid == pageSearch.Mode!.PatrolUid ) - .OrderByDescending(x => x.Id) .SplitTable((DateTime)pageSearch.StartDate!, (DateTime)pageSearch.EndDate!) + .OrderByDescending(x => x.Id) .ToPageListAsync(pageSearch.Index, pageSearch.Size, _Total); + return new PageData() { Index = pageSearch.Index, diff --git a/ZhongLian/ZhongLianService/MaintenanceService.cs b/ZhongLian/ZhongLianService/MaintenanceService.cs index 969c514..bf95489 100644 --- a/ZhongLian/ZhongLianService/MaintenanceService.cs +++ b/ZhongLian/ZhongLianService/MaintenanceService.cs @@ -146,9 +146,9 @@ namespace ZhongLianService .WhereIF(pageSearch.Mode != null && !string.IsNullOrEmpty(pageSearch.Mode.MaintenanceUid), x => x.MaintenanceUid == pageSearch.Mode!.MaintenanceUid ) + .SplitTable((DateTime)pageSearch.StartDate!, (DateTime)pageSearch.EndDate!) .OrderBy("(CASE State WHEN 2 THEN 0 ELSE State END) ASC") .OrderByDescending(x => x.Id) - .SplitTable((DateTime)pageSearch.StartDate!, (DateTime)pageSearch.EndDate!) .ToPageListAsync(pageSearch.Index, pageSearch.Size, _Total); return new PageData() {