Merge remote-tracking branch 'origin/develop' into develop

app/Http/Controllers/Behavior/BehaviorController.php

@@ -28,12 +28,42 @@ class BehaviorController extends Controller
      */
     public function index(Request $request)
     {
-        $bahavior_list = $this->behaviorRepository->index($request->all());
-
-        if ($bahavior_list){
-
-            return $bahavior_list;
-        }
+        $behavior_list = $this->behaviorRepository->index($request->all());
+        $data['data'] = $behavior_list;
+        $data['extra'] = [
+            'filters' => [
+                'virus_behavior_id',
+                'behavior_status',
+                'name',
+            ],
+            'columns' => [
+                '_id',
+                'behavior_name',
+                'id',
+                'virus_behavior_id',
+                'name',
+                'behavior_level',
+                'behavior_cycle_type',
+                'behavior_action_id',
+                'behavior_cycle',
+                'behavior_binding_users',
+                'physical_strength',
+                'rainbow_beans',
+                'remarks',
+                'is_open',
+                'behavioral_cycle_start_time',
+                'behavioral_cycle_end_time',
+                'allotted_quantity_rule',
+                'behavior_identification',
+                'trigger_times',
+                'effective_trigger',
+                'relative_series',
+                'absolute_progression',
+                'created_at',
+                'updated_at'
+            ]
+        ];
+        return $data;
     }
 
 

app/Repositories/Behavior/BehaviorRepository.php

@@ -88,7 +88,7 @@ class BehaviorRepository
         //根据行为ID筛选
         if (isset($request['virus_behavior_id'])){
             foreach ($new_res as $k=>$v){
-                if (isset($v['virus_behavior_id']) && $v['virus_behavior_id'] != $request['virus_behavior_id']){
+                if (isset($v['id']) && $v['id'] != $request['virus_behavior_id']){
                     unset($new_res[$k]);
                     $new_re = array_merge($new_res);
                 }elseif (isset($v['_id']) && $v['_id'] != $request['virus_behavior_id']){
@@ -108,19 +108,19 @@ class BehaviorRepository
             }
             return $new_re;
         }
-        //根据绑定的动作ID筛选
-        if (isset($request['behavior_action_id'])){
-            foreach ($new_res as $key=>$val) {
-                if (isset($val['behavior_action_id']) && ($val['behavior_action_id'] != $request['behavior_action_id'])) {
-                    unset($new_res[$key]);
-                    $new_re = array_merge($new_res);
-                } elseif (!isset($val['behavior_action_id'])) {
-                    unset($new_res[$key]);
-                    $new_re = array_merge($new_res);
-                }
-            }
-            return $new_re;
-        }
+        //根据绑定的动作ID筛选(暂时取消)
+//        if (isset($request['behavior_action_id'])){
+//            foreach ($new_res as $key=>$val) {
+//                if (isset($val['behavior_action_id']) && ($val['behavior_action_id'] != $request['behavior_action_id'])) {
+//                    unset($new_res[$key]);
+////                    $new_re = array_merge($new_res);
+//                } elseif (!isset($val['behavior_action_id'])) {
+//                    unset($new_res[$key]);
+////                    $new_re = array_merge($new_res);
+//                }
+//            }
+//            return $new_re;
+//        }
         //根据行为名称筛选
         if (isset($request['name'])){
             foreach ($new_res as $key => $val) {