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

gx



查看合并请求 !1765

@@ -29,7 +29,6 @@ class ProjectCountryLogic extends BaseLogic
         }
         }
         $lists['country_lists'] = $this->countryListsFormat($lists['country_lists']);
         $lists['country_lists'] = $this->countryListsFormat($lists['country_lists']);
         $lists['country_sort'] = $this->countrySortFormat($lists['country_sort']);
         $lists['country_sort'] = $this->countrySortFormat($lists['country_sort']);
-
         return $this->success($lists);
         return $this->success($lists);
     }
     }
 
 
@@ -116,12 +115,9 @@ class ProjectCountryLogic extends BaseLogic
     }
     }
 
 
     protected function countrySortFormat($country_sort){
     protected function countrySortFormat($country_sort){
-        if(empty($country_sort)){
-            $webLanguageModel = new WebLanguage();
-            $all_language_ids = array_column($webLanguageModel->list([],'id',['id'],'asc'),'id');
-            $country_sort = implode(',',$all_language_ids);
-        }
-
-        return $country_sort;
+        $webLanguageModel = new WebLanguage();
+        $idArr = $webLanguageModel->selectField(['id'=>['not in',explode(',',$country_sort)]],'id');
+        $countryStr = $country_sort.','.implode(',',$idArr);
+        return $countryStr;
     }
     }
 }
 }