Merge branch 'refs/heads/peterguo-dev' into dev

app/Http/Controllers/API/AssetController.php

@@ -175,7 +175,7 @@ class AssetController extends Controller
     public function tree()
     {
         $attachmentArray = [];
-        $assets = Asset::withCount('library')->allowed()->get(['id', 'name', 'parent_id'])
+        $assets = Asset::select(['id', 'name', 'parent_id'])->withCount('library')->allowed()->get()
             ->each(function ($assets) use (&$attachmentArray) {
                 $attachmentArray[]=[
                     'parent_id'=>$assets->id,

app/Http/Controllers/API/ContainerController.php

@@ -220,9 +220,9 @@ class ContainerController extends Controller
 
     public function linkage(string $libraryId)
     {
-        $items = Container::withCount(['folder' => function ($query) {
+        $items = Container::select(['id', 'name'])->withCount(['folder' => function ($query) {
             $query->where('parent_id', 0);
-        }])->allowed()->where("library_id", $libraryId)->get(['id', 'name'])->each(function ($items) {
+        }])->allowed()->where("library_id", $libraryId)->get()->each(function ($items) {
             // 设置固定的type值
             $items->type = 'container';
             $items->uniId=$items->type.'_'.$items->id;

app/Http/Controllers/API/FolderController.php

@@ -32,18 +32,14 @@ class FolderController extends Controller
 
         $object=$folderObjectType->modelBuilderAllowed()->with(['library'])->findOrFail($objectId);
 
-        $folders = Folder::withCount('children')
+        $folders = Folder::select(['id', 'name', 'parent_id'])->withCount('children')
             ->where([
                 'object_type' => $objectType,
                 'object_id' => $objectId,
             ])
             ->where('parent_id', $parentFolderId)
             ->orderByDesc("sequence")
-            ->get([
-                'id',
-                'name',
-                'parent_id'
-            ])
+            ->get()
             ->each(function ($folders){
                 $folders->type='folder';
                 $folders->uniId=$folders->type.'_'.$folders->id;

app/Http/Controllers/API/LibraryController.php

@@ -117,10 +117,10 @@ class LibraryController extends Controller
             LibraryType::CUSTOM => []
         };
 
-        $libraries = Library::withCount('container')
+        $libraries = Library::select(['id', 'name', 'created_at', 'updated_at'])->withCount('container')
             ->allowed()
             ->where("type", $type)->when($where, fn($query) => $query->where($where))
-            ->get(['id', 'name', 'created_at', 'updated_at'])
+            ->get()
             ->each(function ($libraries) {
                 // 设置固定的type值
                 $libraries->type = 'library';