fix:export1

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

@@ -3041,7 +3041,8 @@ class CameraApiController extends BaseController
             ->where('t.is_delete',0)
             ->where('t.delete_type',0)
             ->get();
-        $risk_type_dict = [];
+        // 如果上边查到的风险类型还有问题的话，就用下边的维护的，不要去查数据库
+        $risk_type_dict = ['高处坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息','物体打击','淹溺','灼烫','受限空间','坍塌','锅炉爆炸','其他爆炸','其他伤害'];;
         foreach ($risk_type as $key=>$value) {
             $risk_type_key = $value->value_key;
             $risk_type_name = $value->NAME;
@@ -3215,10 +3216,16 @@ class CameraApiController extends BaseController
                             $risk_info = '';
                             if ($v->risk_level == 0) {
                                 $gao++;
-                                $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
+                                if($v->risk_type != null){
+                                    $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
+                                }
+//                                $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
                             } else if ($v->risk_level == 1) {
                                 $zhong++;
-                                $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
+                                if($v->risk_type != null){
+                                    $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
+                                }
+//                                $risk_info = '('.$risk_desc[$v->risk_level].'，'.$risk_type_dict[$v->risk_type].')';
                             } else {
                                 $di++;
                             }