Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

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

@@ -5312,14 +5312,19 @@ class CameraApiController extends BaseController
         $risk_list = $risk_list->orderBy('risk_level')->get();
         // 下文代码将春检的作业放在其他作业的后边
         $str2="春检：";
+        $str3="秋检：";
         // 存放春检数据
         $temp_list=[];
+        // 存放秋检数据
+        $temp_list0=[];
         // 存放其他数据
         $temp_list2=[];
         foreach ($risk_list as $key=>$value){
             if (strstr($value->risk_name, $str2)){
                 $temp_list[] = $value;
-            }else{
+            } elseif (strstr($value->risk_name, $str3)){
+                $temp_list0[] = $value;
+            } else{
                 $temp_list2[] = $value;
             }
         }
@@ -5331,6 +5336,9 @@ class CameraApiController extends BaseController
         foreach ($temp_list as $key=>$value){
             $risk_list[] = $value;
         }
+        foreach ($temp_list0 as $key=>$value){
+            $risk_list[] = $value;
+        }
 
         // 洗煤厂数据
         $coal_washery_list = DB::connection('mysql_fwe10')->table('uf_xx_coal_washery as t')->where('t.is_delete',0);