Browse Source

container文件数量调整,删除文件夹时把文件夹下的文件也删除

kely 10 months ago
parent
commit
dbc4cfbbe3

+ 1 - 0
app/Http/Controllers/API/ContainerController.php

@@ -41,6 +41,7 @@ class ContainerController extends Controller
         $fileCount = File::query()
             ->where('object_type','container')
             ->whereIn('object_id',$containers->pluck("id")->toArray())
+            ->where("folder_id", 0)
             ->where("is_latest_version", 1)
             ->selectRaw("count(*) as cut, object_id")
             ->groupBy("object_id")

+ 2 - 0
app/Http/Controllers/API/FolderController.php

@@ -224,6 +224,8 @@ class FolderController extends Controller
             return $this->badRequest("Subordinate folders or containers exist and are not allowed to be deleted.");
         }
 
+        $folder->files()->delete();
+
         $folder->delete();
 
         return $this->noContent();