合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !1770

@@ -42,7 +42,7 @@ class GoogleSearchController extends BaseController
             if($this->param['type'] == 'country'){
             if($this->param['type'] == 'country'){
                 $codeCountryModel = new GoogleCodeCountry();
                 $codeCountryModel = new GoogleCodeCountry();
                 foreach ($data['list'] as $key => $val){
                 foreach ($data['list'] as $key => $val){
-                    $val['zh_country'] = $codeCountryModel->getCodeCountry($val['keys']);
+                    $val['zh_country'] = $codeCountryModel->getCodeCountry($val['keys']) ?? $val['keys'];
                     $val['click_rate'] = number_format($val['click_rate'] * 100, 2); // 保留 2 位小数
                     $val['click_rate'] = number_format($val['click_rate'] * 100, 2); // 保留 2 位小数
                     $val['impressions_rate'] = number_format($val['impressions_rate'] * 100, 2);
                     $val['impressions_rate'] = number_format($val['impressions_rate'] * 100, 2);
                     $data['list'][$key] = $val;
                     $data['list'][$key] = $val;