fix:export2Type

Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -3382,17 +3382,31 @@ class CameraApiController extends BaseController
                         }
                         if($risk_list[$j]->risk_level != 2){
                             $index++;
-                            array_push($data,[
-                                'area'=>$risk_list[$j]->area_title,
-                                'index'=>$index,
-                                'risk_type'=>$risk_type[$i],
-                                'risk_level'=>$risk_list[$j]->risk_level,
-                                'unit'=>$risk_list[$j]->coal_title,
-                                'content'=>$risk_list[$j]->risk_name ."[". $risk_list[$j]->move_camera."]",
-                                'people_count'=>$risk_list[$j]->work_num,
-                                'work_location'=>$risk_list[$j]->risk_location,
-                                'leader'=>$risk_list[$j]->work_people
-                            ]);
+                            if ($risk_list[$j]->move_camera != null){
+                                array_push($data,[
+                                    'area'=>$risk_list[$j]->area_title,
+                                    'index'=>$index,
+                                    'risk_type'=>$risk_type[$i],
+                                    'risk_level'=>$risk_list[$j]->risk_level,
+                                    'unit'=>$risk_list[$j]->coal_title,
+                                    'content'=>$risk_list[$j]->risk_name ." [". $risk_list[$j]->move_camera."]",
+                                    'people_count'=>$risk_list[$j]->work_num,
+                                    'work_location'=>$risk_list[$j]->risk_location,
+                                    'leader'=>$risk_list[$j]->work_people
+                                ]);
+                            }else{
+                                array_push($data,[
+                                    'area'=>$risk_list[$j]->area_title,
+                                    'index'=>$index,
+                                    'risk_type'=>$risk_type[$i],
+                                    'risk_level'=>$risk_list[$j]->risk_level,
+                                    'unit'=>$risk_list[$j]->coal_title,
+                                    'content'=>$risk_list[$j]->risk_name,
+                                    'people_count'=>$risk_list[$j]->work_num,
+                                    'work_location'=>$risk_list[$j]->risk_location,
+                                    'leader'=>$risk_list[$j]->work_people
+                                ]);
+                            }
                         }
                         if($risk_list[$j]->risk_level == 2){
                             $nd_di++;
@@ -3433,17 +3447,31 @@ class CameraApiController extends BaseController
                         }
                         if($risk_list[$j]->risk_level != 2){
                             $index++;
-                            array_push($data,[
-                                'area'=>$risk_list[$j]->area_title,
-                                'index'=>$index,
-                                'risk_type'=>$risk_type[$i],
-                                'risk_level'=>$risk_list[$j]->risk_level,
-                                'unit'=>$risk_list[$j]->coal_title,
-                                'content'=>$risk_list[$j]->risk_name,
-                                'people_count'=>$risk_list[$j]->work_num,
-                                'work_location'=>$risk_list[$j]->risk_location,
-                                'leader'=>$risk_list[$j]->work_people
-                            ]);
+                            if ($risk_list[$j]->move_camera != null){
+                                array_push($data,[
+                                    'area'=>$risk_list[$j]->area_title,
+                                    'index'=>$index,
+                                    'risk_type'=>$risk_type[$i],
+                                    'risk_level'=>$risk_list[$j]->risk_level,
+                                    'unit'=>$risk_list[$j]->coal_title,
+                                    'content'=>$risk_list[$j]->risk_name ." [". $risk_list[$j]->move_camera."]",
+                                    'people_count'=>$risk_list[$j]->work_num,
+                                    'work_location'=>$risk_list[$j]->risk_location,
+                                    'leader'=>$risk_list[$j]->work_people
+                                ]);
+                            }else{
+                                array_push($data,[
+                                    'area'=>$risk_list[$j]->area_title,
+                                    'index'=>$index,
+                                    'risk_type'=>$risk_type[$i],
+                                    'risk_level'=>$risk_list[$j]->risk_level,
+                                    'unit'=>$risk_list[$j]->coal_title,
+                                    'content'=>$risk_list[$j]->risk_name,
+                                    'people_count'=>$risk_list[$j]->work_num,
+                                    'work_location'=>$risk_list[$j]->risk_location,
+                                    'leader'=>$risk_list[$j]->work_people
+                                ]);
+                            }
                         }
                         if($risk_list[$j]->risk_level == 2){
                             $tx_di++;