Browse Source

资产修改参数条件

kely 1 year ago
parent
commit
a25fecd34a
2 changed files with 12 additions and 7 deletions
  1. 8 7
      app/Http/Controllers/API/AssetController.php
  2. 4 0
      app/ModelFilters/AssetFilter.php

+ 8 - 7
app/Http/Controllers/API/AssetController.php

@@ -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);
     }
 

+ 4 - 0
app/ModelFilters/AssetFilter.php

@@ -28,4 +28,8 @@ class AssetFilter extends ModelFilter
     {
         return $this->where('name', 'like', "%$name%");
     }
+
+    public function group($group_id){
+        return $this->where('group_id',$group_id);
+    }
 }