|
@@ -259,7 +259,7 @@ class FolderController extends Controller
|
|
|
->when($folderId, fn($query) => $query->where("parent_id", $folderId))
|
|
|
->when(! $folderId, fn($query) => $query->where("parent_id", 0))
|
|
|
->orderBy('updated_at', $orderBy)
|
|
|
- ->get(['id', 'name','parent_id']);
|
|
|
+ ->get(['id', 'name']);
|
|
|
|
|
|
$sonFolderCount=Folder::query()
|
|
|
->where($objectWhere)
|
|
@@ -295,6 +295,7 @@ class FolderController extends Controller
|
|
|
'data' => [
|
|
|
'folders' => $folders,
|
|
|
'files' => FileByObjectResource::collection($files),
|
|
|
+ 'folder_parent_id'=>$folderId>0?$folder->parent_id:$folderId,
|
|
|
]
|
|
|
]);
|
|
|
}
|