|
@@ -35,9 +35,11 @@ class FolderController extends Controller
|
|
|
'object_type' => $objectType,
|
|
|
'object_id' => $objectId,
|
|
|
])
|
|
|
- ->when(request("parent_id", 0) > 0, function ($query) {
|
|
|
- return $query->where("path", "like", "%," . \request("parent_id") . ",%")->where("id", "!=", \request("parent_id"));
|
|
|
- })
|
|
|
+// ->when(request("parent_id", 0) > 0, function ($query) {
|
|
|
+// return $query->where("path", "like", "%," . \request("parent_id") . ",%")->where("id", "!=", \request("parent_id"));
|
|
|
+// })
|
|
|
+// 文件夹树暂时显示一层
|
|
|
+ ->where('parent_id',0)
|
|
|
->orderByDesc("sequence")
|
|
|
->get([
|
|
|
'id',
|
|
@@ -49,7 +51,8 @@ class FolderController extends Controller
|
|
|
$folders->uniId=$folders->type.'_'.$folders->id;
|
|
|
});
|
|
|
return $this->success([
|
|
|
- 'data' => make_tree($folders->toArray(), \request("parent_id", 0)),
|
|
|
+ //'data' => make_tree($folders->toArray(), \request("parent_id", 0)),
|
|
|
+ 'data' => $folders
|
|
|
]);
|
|
|
}
|
|
|
|