search

app/Http/Controllers/API/FolderController.php

@@ -247,6 +247,10 @@ class FolderController extends Controller
         $pageSize = $request->get('page_size') ?? 10;
         $page = $request->get('page') ?? 1;
 
+        $docStages = $request->get('doc_stage', []); // 支持多选
+        $docTypes = $request->get('doc_type', []); // 支持多选
+        $namingRuleIds = $request->get('naming_rule_id', []); // 支持多选
+
         $folderId = $request->get("id", 0);
         $orderBy=$request->get('order_by','desc');
         if ($folderId > 0) {
@@ -271,6 +275,7 @@ class FolderController extends Controller
             ->where($objectWhere)
             ->when($folderId, fn($query) => $query->where("parent_id", $folderId))
             ->when(! $folderId, fn($query) => $query->where("parent_id", 0))
+            ->when($namingRuleIds, fn($query) => $query->where("naming_rule_id", $namingRuleIds))
             ->orderBy('updated_at', $orderBy)
             ->paginate($pageSize);
         $folders_total = $folders->total();
@@ -303,6 +308,9 @@ class FolderController extends Controller
             ->with('bimFile')
             ->where("folder_id", $folderId)
             ->where("is_latest_version", 1)
+            ->when($docStages, fn($query) => $query->whereIn('doc_stage', $docStages))
+            ->when($docTypes, fn($query) => $query->whereIn('doc_type', $docTypes))
+            ->when($namingRuleIds, fn($query) => $query->whereIn('naming_rule_id', $namingRuleIds))
             ->orderBy('updated_at', $orderBy)
             ->get();
 
@@ -430,7 +438,7 @@ class FolderController extends Controller
             ->where($objectWhere)
             ->where('title','like',"%$name%")
             ->where("is_latest_version", 1);
-        
+
         // 添加doc_stage多选过滤
         if (!empty($docStages)) {
             $fileQuery->whereIn('doc_stage', $docStages);