未完成已完成 搜索

app/Admin/Controllers/AlreadyDoneTaskController.php

@@ -127,15 +127,15 @@ class AlreadyDoneTaskController extends AdminController
         $param = request()->input();
 
         return Grid::make(\App\Models\Tas::with(['receives'=>fn($q)=>$q->where('status','>',0)
-            ,'receives.task'=>fn($q)=>$q->where(function ($que)use($param){
+            ->whereHas('task',function ($query)use($param){
                 if (!empty($param['receives']['task']['name'])){
-                    $que->where('name','like',"%{$param['receives']['task']['name']}%");
+                    $query->where('name','like',"%{$param['receives']['task']['name']}%");
                 }
                 if (!empty($param['receives']['task']['city_id'])){
-                    $que->where('city_id','like',"%{$param['receives']['task']['city_id']}%");
+                    $query->where('city_id','like',"%{$param['receives']['task']['city_id']}%");
                 }
                 if (!empty($param['receives']['task']['year'])){
-                    $que->where('year','like',"%{$param['receives']['task']['year']}%");
+                    $query->where('year','like',"%{$param['receives']['task']['year']}%");
                 }
             })
             ,'receives.user','receives.collects','receives.approve'])->whereHas('receives',function ($query){

app/Admin/Controllers/NoDoneTaskController.php

@@ -113,15 +113,15 @@ class NoDoneTaskController extends AdminController
         $param = request()->input();
 
         return Grid::make(\App\Models\Tas::with(['receives'=>fn($q)=>$q->where('status',0)
-            ,'receives.task'=>fn($q)=>$q->where(function ($que)use($param){
+            ->whereHas('task',function ($query)use($param){
                 if (!empty($param['receives']['task']['name'])){
-                    $que->where('name','like',"%{$param['receives']['task']['name']}%");
+                    $query->where('name','like',"%{$param['receives']['task']['name']}%");
                 }
                 if (!empty($param['receives']['task']['city_id'])){
-                    $que->where('city_id','like',"%{$param['receives']['task']['city_id']}%");
+                    $query->where('city_id','like',"%{$param['receives']['task']['city_id']}%");
                 }
                 if (!empty($param['receives']['task']['year'])){
-                    $que->where('year','like',"%{$param['receives']['task']['year']}%");
+                    $query->where('year','like',"%{$param['receives']['task']['year']}%");
                 }
             })
             ,'receives.user'