Merge branch 'web_sannong_fr' into dev

app/JsonRpc/NewsService.php

@@ -898,11 +898,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');
+            $query = Article::where($where)->where(function ($q) {
+                $q->whereNotNull('survey_name')->where('survey_name', '!=', '');
+            });
         } else {
-            $query = Article::whereNotNull('survey_name');
+            $query = Article::where(function ($q) {
+                $q->whereNotNull('survey_name')->where('survey_name', '!=', '');
+            });
         }
+        
         $count = $query->count();
         $survey = $query->orderByDesc('id')
             ->limit($data['pageSize'])