|
@@ -247,7 +247,11 @@ class FolderController extends Controller
|
|
|
->where($objectWhere)
|
|
|
->when($folderId, fn($query) => $query->where("parent_id", $folderId))
|
|
|
->when(! $folderId, fn($query) => $query->where("parent_id", 0))
|
|
|
- ->get(['id', 'name']);
|
|
|
+ ->get(['id', 'name'])->each(function ($folders)use ($folderId){
|
|
|
+ $folderCount=Folder::query()->where('parent_id',$folders->id)->count();
|
|
|
+ $filesCount=File::query()->where('folder_id',$folderId>0?$folders->id:$folderId)->where("is_latest_version", 1)->count();
|
|
|
+ $folders->itemCount=$folderCount+$filesCount;
|
|
|
+ });
|
|
|
|
|
|
|
|
|
$files = File::query()->where($objectWhere)
|