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

app/Http/Controllers/Behavior/BehaviorController.php

@@ -29,6 +29,18 @@ class BehaviorController extends Controller
     public function index(Request $request)
     {
         $behavior_list = $this->behaviorRepository->index($request->all());
+        if (count($behavior_list)>0){
+            foreach ($behavior_list as $k=>$v){
+                if (isset($behavior_list[$k]['_id']) || isset($behavior_list[$k]['behavior_name'])){
+                    $behavior_list[$k]['_id'] = $v['_id'];
+                    $behavior_list[$k]['behavior_name'] = $v['behavior_name'];
+                    $behavior_list[$k]['virus_behavior_id'] = $v['_id'];
+                    $behavior_list[$k]['name'] = $v['behavior_name'];
+                    unset($behavior_list[$k]['_id']);
+                    unset($behavior_list[$k]['behavior_name']);
+                }
+            }
+        }
         $data['data'] = $behavior_list;
         $data['extra'] = [
             'filters' => [
@@ -37,8 +49,6 @@ class BehaviorController extends Controller
                 'name',
             ],
             'columns' => [
-                '_id',
-                'behavior_name',
                 'id',
                 'virus_behavior_id',
                 'name',