|
@@ -3101,7 +3101,10 @@ class CameraApiController extends BaseController
|
|
->join('uf_xx_area as t2','t1.area_id','=','t2.id')
|
|
->join('uf_xx_area as t2','t1.area_id','=','t2.id')
|
|
->where('t2.is_delete',0)
|
|
->where('t2.is_delete',0)
|
|
->where('t2.delete_type',0)
|
|
->where('t2.delete_type',0)
|
|
- ->where('t2.id', $area_id);
|
|
|
|
|
|
+ ->where('t2.id', $area_id)
|
|
|
|
+ ->select([
|
|
|
|
+ 't.*'
|
|
|
|
+ ]);
|
|
}
|
|
}
|
|
|
|
|
|
$risk_list = $risk_list->orderBy('risk_level')->get();
|
|
$risk_list = $risk_list->orderBy('risk_level')->get();
|
|
@@ -4637,7 +4640,10 @@ class CameraApiController extends BaseController
|
|
->join('uf_xx_area as t2','t1.area_id','=','t2.id')
|
|
->join('uf_xx_area as t2','t1.area_id','=','t2.id')
|
|
->where('t2.is_delete',0)
|
|
->where('t2.is_delete',0)
|
|
->where('t2.delete_type',0)
|
|
->where('t2.delete_type',0)
|
|
- ->where('t2.id', $area_id);
|
|
|
|
|
|
+ ->where('t2.id', $area_id)
|
|
|
|
+ ->select([
|
|
|
|
+ 't.*'
|
|
|
|
+ ]);
|
|
}
|
|
}
|
|
|
|
|
|
$risk_list = $risk_list->orderBy('risk_level')->get();
|
|
$risk_list = $risk_list->orderBy('risk_level')->get();
|