|
...
|
...
|
@@ -77,8 +77,8 @@ class NewsController extends BaseController |
|
|
|
if(isset($this->map['name']) && !empty($this->map['name'])){
|
|
|
|
$query = $query->where('name',$this->map['name'][0],'%'.$this->map['name'][1].'%');
|
|
|
|
}
|
|
|
|
if(!empty($this->map['start_at']) && !empty($this->map['end_at'])){
|
|
|
|
$query->whereBetween('created_at', [$this->map['start_at'],$this->map['end_at']]);
|
|
|
|
if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
|
|
|
|
$query->whereBetween('created_at', [$this->param['start_at'],$this->param['end_at']]);
|
|
|
|
}
|
|
|
|
return $query;
|
|
|
|
}
|
...
|
...
|
|