gx

@@ -396,36 +396,39 @@ class PrivateController extends BaseController
         ProjectServer::useProject($info['project_id']);
         $projectKeywordModel = new ProjectKeyword();
         $keywordsInfo = $projectKeywordModel->read(['project_id'=>$info['project_id']],'customer_keywords');
-        $keywords_sts = $keywordsInfo['customer_keywords'];
-        if(!empty($keywords_sts)){
+        if(empty($keywordsInfo)){
             $productKeywordModel = new Keyword();
-            $keywords_arr = explode("\n",$keywords_sts);
-            $num = count($keywords_arr);
-            if($num >= 50){
-                $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->whereIn('title',$keywords_arr)->limit(50)->pluck('title', 'route')->toArray();
-                $list_num = count($list);
-                if($list_num < 50){
-                    $key_list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50 - $list_num)->pluck('title','route')->toArray();
+            $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50)->pluck('title','route')->toArray();
+        }else{
+            $keywords_sts = $keywordsInfo['customer_keywords'];
+            if(!empty($keywords_sts)){
+                $productKeywordModel = new Keyword();
+                $keywords_arr = explode("\n",$keywords_sts);
+                $num = count($keywords_arr);
+                if($num >= 50){
+                    $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->whereIn('title',$keywords_arr)->limit(50)->pluck('title', 'route')->toArray();
+                    $list_num = count($list);
+                    if($list_num < 50){
+                        $key_list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50 - $list_num)->pluck('title','route')->toArray();
+                    }
+                    $list = array_merge($key_list,$list);
+                }else{
+                    $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->whereIn('title',$keywords_arr)->pluck('title', 'route')->toArray();
+                    $key_list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50 - $num)->pluck('title','route')->toArray();
+                    $list = array_merge($key_list,$list);
                 }
-                $list = array_merge($key_list,$list);
             }else{
-                $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->whereIn('title',$keywords_arr)->pluck('title', 'route')->toArray();
-                $key_list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50 - $num)->pluck('title','route')->toArray();
-                $list = array_merge($key_list,$list);
+                $productKeywordModel = new Keyword();
+                $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50)->pluck('title','route')->toArray();
             }
-        }else{
-            $productKeywordModel = new Keyword();
-            $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50)->pluck('title','route')->toArray();
         }
         $data = [];
         foreach ($list as $k => $v){
             $route = 'https://' . $this->param['domain'].'/'.$k;
-//            $keyword = $v;
             $data[] = [
                 'keyword' => $v,
                 'url' => $route
             ];
-//            $data[$keyword] = $route;
         }
         DB::disconnect('custom_mysql');
         $this->response('success',Code::SUCCESS,$data);