gq 7 éve
szülő
commit
e95c7e69b7

+ 11 - 2
server/app/Http/Controllers/Admin/User/BanksController.php

xqd xqd
@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\User;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\UserBanksModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\User\Criteria\MultiWhere;
@@ -23,8 +24,16 @@ class BanksController extends Controller
 
     function index(Request $reqeust) {
         $search['keyword'] = $reqeust->input('keyword');
-        $query = $this->repository->pushCriteria(new MultiWhere($search));
-
+        $query = new UserBanksModel();
+        if(isset($search['keyword']) && $search['keyword']) {
+            $query = $query->where('bank_name','like','%'.$search['keyword'].'%')
+                ->orWhere('bank_number','like','%'.$search['keyword'].'%')
+                ->orWhere('bank_phone','like','%'.$search['keyword'].'%')
+                ->orWhereHas('user', function ($que) use ($search) {
+                    $que->where('nickname','like','%'.$search['keyword'].'%');
+                })
+            ;
+        }
         if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
         $query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));
         }

+ 2 - 6
server/app/Repositories/User/Criteria/MultiWhere.php

xqd
@@ -36,12 +36,8 @@ class MultiWhere extends Criteria {
     public function apply($model, Repository $repository)
     {
         if(isset($this->search['keyword']) && $this->search['keyword']) {
-              $model = $model->where('bank_name','like','%'.$this->search['keyword'].'%')
-              ->orWhere('bank_number','like','%'.$this->search['keyword'].'%')
-              ->orWhere('bank_phone','like','%'.$this->search['keyword'].'%')
-              ->orWhereHas('user', function ($query) {
-                  $query->where('nickname','like','%'.$this->search['keyword'].'%');
-              })
+              $model = $model->where('id','like','%'.$this->search['keyword'].'%')
+              ->orWhere('nickname','like','%'.$this->search['keyword'].'%')
               ;
           }
          return $model;