|
|
@@ -271,8 +271,10 @@ class FolderController extends Controller
|
|
|
|
|
|
|
|
|
$objectWhere = ['object_type' => $objectType, 'object_id' => $objectId,];
|
|
|
- $folders = Folder::query()
|
|
|
- ->select(['id', 'name'])
|
|
|
+ $folders = Folder::with(["namingRule" => function ($query) {
|
|
|
+ $query->select(['id', 'name', 'combination_rules']);
|
|
|
+ }])
|
|
|
+ ->select(['id', 'name', 'naming_rule_id'])
|
|
|
->where($objectWhere)
|
|
|
->when($folderId, fn($query) => $query->where("parent_id", $folderId))
|
|
|
->when(! $folderId, fn($query) => $query->where("parent_id", 0))
|
