Merge pull request #110 from EasyAbp/fix-sorting

Fix the sorting of the file list API
EasyAbp · Nov 27, 2023 · 9fe2b04 · 9fe2b04
2 parents 8787199 + c4e15ef
commit 9fe2b04
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/EasyAbp.FileManagement.Application/EasyAbp/FileManagement/Files/FileAppService.cs b/src/EasyAbp.FileManagement.Application/EasyAbp/FileManagement/Files/FileAppService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Linq.Dynamic.Core;
 using System.Threading.Tasks;
 using EasyAbp.FileManagement.Containers;
 using EasyAbp.FileManagement.Files.Dtos;
@@ -67,16 +68,21 @@ public override async Task<PagedResultDto<FileInfoDto>> GetListAsync(GetFileList
             );
         }
 
+        protected override IQueryable<File> ApplySorting(IQueryable<File> query, GetFileListInput input)
+        {
+            return input.Sorting.IsNullOrWhiteSpace()
+                ? query.OrderBy(x => x.FileType).ThenBy(x => x.FileName)
+                : query.OrderBy(x => x.FileType).ThenBy(input.Sorting!);
+        }
+
         protected override async Task<IQueryable<File>> CreateFilteredQueryAsync(GetFileListInput input)
         {
             await Task.CompletedTask;
 
             return (await _repository.GetQueryableAsync())
                 .Where(x => x.ParentId == input.ParentId && x.OwnerUserId == input.OwnerUserId &&
                             x.FileContainerName == input.FileContainerName)
-                .WhereIf(input.DirectoryOnly, x => x.FileType == FileType.Directory)
-                .OrderBy(x => x.FileType)
-                .ThenBy(x => x.FileName);
+                .WhereIf(input.DirectoryOnly, x => x.FileType == FileType.Directory);
         }
 
         [Authorize]