|
@@ -131,7 +131,7 @@ class Station extends Model
|
|
|
{
|
|
|
$time=date('Y-m-d H:i:s',time()-300);
|
|
|
if($value=='1'){
|
|
|
- return $query->where('online_time', '>=', $time);
|
|
|
+ return $query->where('online_time', '>=', $time)->whereOr('online_state','=', 1);
|
|
|
}elseif($value=='2'){
|
|
|
return $query->where(function ($query) use( $time) {
|
|
|
$query->whereOr('online_time','<', $time)->whereOr('online_time','=', null);
|