|
@@ -274,13 +274,13 @@ class FolderController extends Controller
|
|
|
$folders = Folder::with(["namingRule" => function ($query) {
|
|
|
$query->select(['id', 'name', 'combination_rules']);
|
|
|
}])
|
|
|
- ->select(['id', 'name', 'naming_rule_id'])
|
|
|
+ ->select(['id', 'name', 'naming_rule_id', 'created_at', 'updated_at'])
|
|
|
->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))
|
|
|
- ->orderBy($orderByFiled, $orderByType)
|
|
|
+ ->orderBy(in_array($orderByFiled, Folder::getColumns()) ? $orderByFiled : 'updated_at', $orderByType)
|
|
|
->paginate($pageSize);
|
|
|
$folders_total = $folders->total();
|
|
|
$sonFolderCount=Folder::query()
|
|
@@ -316,7 +316,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))
|
|
|
- ->orderBy($orderByFiled, $orderByType)
|
|
|
+ ->orderBy(in_array($orderByFiled, File::getColumns()) ? $orderByFiled : 'updated_at', $orderByType)
|
|
|
->get();
|
|
|
|
|
|
$files_total = $files->count();
|
|
@@ -334,7 +334,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))
|
|
|
- ->orderBy($orderByFiled, $orderByType)
|
|
|
+ ->orderBy(in_array($orderByFiled, File::getColumns()) ? $orderByFiled : 'updated_at', $orderByType)
|
|
|
->offset($offset)
|
|
|
->limit($limit)
|
|
|
->get();
|