作者 李宇航

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

gx



查看合并请求 !1766
@@ -117,7 +117,9 @@ class ProjectCountryLogic extends BaseLogic @@ -117,7 +117,9 @@ class ProjectCountryLogic extends BaseLogic
117 protected function countrySortFormat($country_sort){ 117 protected function countrySortFormat($country_sort){
118 $webLanguageModel = new WebLanguage(); 118 $webLanguageModel = new WebLanguage();
119 $idArr = $webLanguageModel->selectField(['id'=>['not in',explode(',',$country_sort)]],'id'); 119 $idArr = $webLanguageModel->selectField(['id'=>['not in',explode(',',$country_sort)]],'id');
120 - $countryStr = $country_sort.','.implode(',',$idArr);  
121 - return $countryStr; 120 + if(!empty($idArr)){
  121 + $country_sort = $country_sort.','.implode(',',$idArr);
  122 + }
  123 + return $country_sort;
122 } 124 }
123 } 125 }