筛选字段变更

app/Http/Controllers/Behavior/BehaviorController.php

@@ -139,11 +139,8 @@ class BehaviorController extends Controller
                 'is_open',
                 'behavior_level',
                 'name',
-                'trigger_times',
-                'effective_trigger',
-                'absolute_progression',
-                'physical_strength',
-                'grant_rainbow_beans',
+                'sort',
+                'search'
             ],
             'columns' => [
                 'id',

app/Repositories/Behavior/BehaviorRepository.php

@@ -368,28 +368,38 @@ class BehaviorRepository
             $where[] = ['name', 'like', "%{$request['name']}%"];
         }
 
-        if(isset($request['trigger_times'])){//触发次数由多到少-由少到多筛选
-            $filed = 'trigger_times';
-            $sort = $request['trigger_times']   == 0 ? 'desc' : 'asc';
-        }elseif(isset($request['effective_trigger'])){//有效触发由多到少-由少到多筛选
-            $filed = 'effective_trigger';
-            $sort=$request['effective_trigger']  == 0 ? 'desc' : 'asc';
-        }elseif (isset($request['absolute_progression'])){////绝对级数由多到少-由少到多筛选
-            $filed = 'absolute_progression';
-            $sort=$request['absolute_progression']  == 0 ? 'desc' : 'asc';
-        }elseif (isset($request['physical_strength'])){//耗费体力值由多到少-由少到多筛选
-            $filed = 'physical_strength';
-            $sort=$request['physical_strength']  == 0 ? 'desc' : 'asc';
-        }elseif (isset($request['grant_rainbow_beans'])) {//发放彩虹豆由多到少-由少到多筛选
-            $filed = 'grant_rainbow_beans';
-            $sort = $request['grant_rainbow_beans'] == 0 ? 'desc' : 'asc';
-        }else{
-            $sort = 'desc';
-            $filed = 'id';
+        $sort = 'desc';
+        $filed = 'id';
+        if(isset($request['search']) && isset($request['sort'])){
+                $filed = $this->check_search($request['search']);
+                $sort = $request['sort']   == 0 ? 'desc' : 'asc';
         }
 
         return $this->behavior->where($where)->orderBy($filed,$sort)->paginate($perPage);
     }
 
+    private function check_search($search)
+    {
+        $result = "";
+        switch ($search) {
+            case 'trigger_times':
+                $result = $search;
+                break;
+            case 'effective_trigger':
+                $result = $search;
+                break;
+            case 'absolute_progression':
+                $result = $search;
+                break;
+            case 'physical_strength':
+                $result = $search;
+                break;
+            case 'grant_rainbow_beans':
+                $result = $search;
+                break;
+        }
+        return $result;
+    }
+
 }