|
@@ -16,15 +16,16 @@ class AssetController extends Controller
|
|
|
*/
|
|
|
public function index(Request $request)
|
|
|
{
|
|
|
- $name=$request->input("name");
|
|
|
- $groupId=$request->input("groupId");
|
|
|
- $assets=Asset::allowed()->where('name', 'like', "%{$name}%")
|
|
|
- ->when($groupId,function ($query,$groupId){
|
|
|
- return $query->where('group_id',$groupId);
|
|
|
- })
|
|
|
- ->get();
|
|
|
+// $name=$request->input("name");
|
|
|
+// $groupId=$request->input("groupId");
|
|
|
+// $assets=Asset::allowed()->where('name', 'like', "%{$name}%")
|
|
|
+// ->when($groupId,function ($query,$groupId){
|
|
|
+// return $query->where('group_id',$groupId);
|
|
|
+// })->where("parent_id",0)->with(['children'])
|
|
|
+// ->get();
|
|
|
//$assets = Asset::allowed()->filter($request->all())->get();
|
|
|
|
|
|
+ $assets = Asset::filter($request->all())->where("parent_id", 0)->with(['children'])->simplePaginate();
|
|
|
return AssetResource::collection($assets);
|
|
|
}
|
|
|
|