order by

app/Http/Controllers/API/FolderController.php

@@ -308,7 +308,7 @@ class FolderController extends Controller
             return $folder;
         });
 
-        $files = File::query()->where($objectWhere)
+       $fileQuery = File::query()->where($objectWhere)
             ->with('bimFile')
             ->where("folder_id", $folderId)
             ->where("is_latest_version", 1)
@@ -316,8 +316,9 @@ class FolderController extends Controller
             ->when($docStages, fn($query) => $query->whereIn('doc_stage', $docStages))
             ->when($docTypes, fn($query) => $query->whereIn('doc_type', $docTypes))
             ->when($namingRuleIds, fn($query) => $query->whereIn('naming_rule_id', $namingRuleIds))
-            ->orderBy(in_array($orderByFiled, File::getColumns()) ? $orderByFiled : 'updated_at', $orderByType)
-            ->get();
+            ->orderBy(in_array($orderByFiled, File::getColumns()) ? $orderByFiled : 'updated_at', $orderByType);
+
+        $files = $fileQuery->get();
 
         $files_total = $files->count();
 
@@ -326,18 +327,7 @@ class FolderController extends Controller
             $offset = $pageSize * $page - $folders_total <= $pageSize ?  0 : $pageSize  * $page - $pageSize * ($page - 1) - $folders_total ; // 查看当前页面是否有包含文件夹
             $limit = $pageSize * $page - $folders_total > $pageSize ? $pageSize : $pageSize * $page - $folders_total;
 
-            $files = File::query()->where($objectWhere)
-                ->with('bimFile')
-                ->where("folder_id", $folderId)
-                ->where("is_latest_version", 1)
-                ->when($name, fn($query) => $query->where("title", "like", "%$name%"))
-                ->when($docStages, fn($query) => $query->whereIn('doc_stage', $docStages))
-                ->when($docTypes, fn($query) => $query->whereIn('doc_type', $docTypes))
-                ->when($namingRuleIds, fn($query) => $query->whereIn('naming_rule_id', $namingRuleIds))
-                ->orderBy(in_array($orderByFiled, File::getColumns()) ? $orderByFiled : 'updated_at', $orderByType)
-                ->offset($offset)
-                ->limit($limit)
-                ->get();
+            $files = $fileQuery->offset($offset)->limit($limit)->get();
             //因为要接着文件夹进行文件id递增
             $folderCount=$folders->count()+1;
             $files->map(function (File $file) use (&$folderCount) {