opt

app/Http/Controllers/API/FolderController.php

@@ -325,7 +325,7 @@ class FolderController extends Controller
         //分页
         if ($folders_total < $pageSize * $page){
             $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;
+            $limit = min($pageSize * $page - $folders_total, $pageSize);
 
             $files = $fileQuery->offset($offset)->limit($limit)->get();
             //因为要接着文件夹进行文件id递增