|
@@ -314,7 +314,7 @@ class FolderController extends Controller
|
|
|
$total = $files_total + $folders_total;
|
|
|
//分页
|
|
|
if ($folders_total < $pageSize * $page){
|
|
|
- $offset = $pageSize * $page - $folders_total < $pageSize ? 0 : $pageSize * $page - $total - $folders_total; // 查看当前页面是否有包含文件夹
|
|
|
+ $offset = $pageSize * $page - $folders_total <= $pageSize ? 0 : $pageSize * $page - $total - $folders_total; // 查看当前页面是否有包含文件夹
|
|
|
$limit = $pageSize * $page - $folders_total > $pageSize ? $pageSize : $pageSize * $page - $folders_total;
|
|
|
|
|
|
$files = File::query()->where($objectWhere)
|