fix: 修复新功能带来的数据错误

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

@@ -3066,6 +3066,8 @@ class CameraApiController extends BaseController
                 ->whereDate('t.create_time', $date)
                 ->where('t.is_delete',0)
                 ->where('t.delete_type',0)
+                ->where('t.wwdw',null)
+                ->where('t.sgdd',null)
                 ->where('t.current_step','结束节点')
                 ->whereNotNull('t.flow_id');
         }else{
@@ -3075,6 +3077,8 @@ class CameraApiController extends BaseController
                 ->whereDate('t.create_time', $date)
                 ->where('t.is_delete',0)
                 ->where('t.delete_type',0)
+                ->where('t.wwdw',null)
+                ->where('t.sgdd',null)
                 ->where('t.current_step','结束节点')
                 ->whereNotNull('t.flow_id');
         }
@@ -3408,6 +3412,8 @@ class CameraApiController extends BaseController
             ->leftJoin('uf_xx_area as area','area.id','=','coal.area_id')
             ->where('risk.is_delete',0)
             ->where('risk.delete_type',0)
+            ->where('risk.wwdw',null)
+            ->where('risk.sgdd',null)
             ->whereDate('risk.create_time', $date)
             // ->whereIn('risk.risk_level',[0,1])
             ->where('risk.current_step','结束节点')
@@ -3645,6 +3651,8 @@ class CameraApiController extends BaseController
             ->where('t.is_delete', 0)
             ->where('t.current_step','结束节点')
             ->where('t.delete_type',0)
+            ->where('t.wwdw',null)
+            ->where('t.sgdd',null)
             ->whereNotNull('flow_id')
             ->where('move_camera','!=',null)
             ->orderBy('create_time')->get();
@@ -3732,6 +3740,8 @@ class CameraApiController extends BaseController
             ->where('t.wcqk',0)
             ->where('t.is_delete',0)
             ->where('t.delete_type',0)
+            ->where('t.wwdw',null)
+            ->where('t.sgdd',null)
             ->where('t.current_step','结束节点')
             ->whereNotNull('t.flow_id')
             ->get();
@@ -3859,6 +3869,8 @@ class CameraApiController extends BaseController
                     ->where('wcqk',0)
                     ->where('t.is_delete',0)
                     ->where('t.delete_type',0)
+                    ->where('t.wwdw',null)
+                    ->where('t.sgdd',null)
                     ->where('t.current_step','结束节点')
                     ->whereNotNull('t.flow_id')
                     ->orderBy('create_time')->get();
@@ -3954,6 +3966,8 @@ class CameraApiController extends BaseController
                     ->where('wcqk',0)
                     ->where('t.is_delete',0)
                     ->where('t.delete_type',0)
+                    ->where('t.wwdw',null)
+                    ->where('t.sgdd',null)
                     ->where('t.current_step','结束节点')
                     ->whereNotNull('t.flow_id')
                     ->orderBy('create_time')->get();
@@ -4041,6 +4055,8 @@ class CameraApiController extends BaseController
             ->whereBetween('t.create_time', [$start_time, $end_time])
             ->where('t.is_delete',0)
             ->where('t.delete_type',0)
+            ->where('t.wwdw',null)
+            ->where('t.sgdd',null)
             ->where('t.current_step','结束节点')
             ->whereNotNull('t.flow_id')
             ->orderBy('t1.sort')
@@ -4173,6 +4189,8 @@ class CameraApiController extends BaseController
         $risk_list = DB::connection('mysql_fwe10')->table('uf_xx_risk_assignment')
             ->whereBetween('create_time', [$start_time, $end_time])
             ->where('is_delete',0)
+            ->where('wwdw',null)
+            ->where('sgdd',null)
             ->where('current_step','结束节点')
             ->where('delete_type',0)
             ->whereNotNull('flow_id')