|
@@ -655,11 +655,17 @@ class NewsService implements NewsServiceInterface
|
|
|
array_push($where,['is_survey','=',$data['is_survey']]);
|
|
|
}
|
|
|
// return Result::success($where);
|
|
|
- if(!empty($where)){
|
|
|
- $query = Article::where($where)->whereNotNull('survey_name');
|
|
|
- }else{
|
|
|
- $query = Article::whereNotNull('survey_name');
|
|
|
+
|
|
|
+ if (!empty($where)) {
|
|
|
+ $query = Article::where($where)->where(function ($q) {
|
|
|
+ $q->whereNotNull('survey_name')->where('survey_name', '!=', '');
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ $query = Article::where(function ($q) {
|
|
|
+ $q->whereNotNull('survey_name')->where('survey_name', '!=', '');
|
|
|
+ });
|
|
|
}
|
|
|
+
|
|
|
$count = $query->count();
|
|
|
$survey = $query->orderByDesc('id')
|
|
|
->limit($data['pageSize'])
|