|
|
@@ -250,6 +250,7 @@ class FolderController extends Controller
|
|
|
$docStages = $request->get('doc_stage', []); // 支持多选
|
|
|
$docTypes = $request->get('doc_type', []); // 支持多选
|
|
|
$namingRuleIds = $request->get('naming_rule_id', []); // 支持多选
|
|
|
+ $name = $request->get('name');
|
|
|
|
|
|
$folderId = $request->get("id", 0);
|
|
|
$orderBy=$request->get('order_by','desc');
|
|
|
@@ -273,6 +274,7 @@ class FolderController extends Controller
|
|
|
}])
|
|
|
->select(['id', 'name', 'naming_rule_id'])
|
|
|
->where($objectWhere)
|
|
|
+ ->when($name, fn($query) => $query->where("name", "like", "%$name%"))
|
|
|
->when($folderId, fn($query) => $query->where("parent_id", $folderId))
|
|
|
->when(! $folderId, fn($query) => $query->where("parent_id", 0))
|
|
|
->when($namingRuleIds, fn($query) => $query->whereIn("naming_rule_id", $namingRuleIds))
|
|
|
@@ -311,6 +313,7 @@ class FolderController extends Controller
|
|
|
->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))
|
|
|
+ ->when($name, fn($query) => $query->where("title", "like", "%$name%"))
|
|
|
->orderBy('updated_at', $orderBy)
|
|
|
->get();
|
|
|
|
