gx

@@ -396,30 +396,30 @@ class PrivateController extends BaseController
         ProjectServer::useProject($info['project_id']);
         ProjectServer::useProject($info['project_id']);
         $projectKeywordModel = new ProjectKeyword();
         $projectKeywordModel = new ProjectKeyword();
         $keywordsInfo = $projectKeywordModel->read(['project_id'=>$info['project_id']],'customer_keywords');
         $keywordsInfo = $projectKeywordModel->read(['project_id'=>$info['project_id']],'customer_keywords');
-        if(empty($keywordsInfo)){
-            $productKeywordModel = new Keyword();
-            $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50)->pluck('title','route')->toArray();
+        if($keywordsInfo === false){
+            $keywordModel = new Keyword();
+            $list = $keywordModel::orderByRaw('LENGTH(title) ASC')->limit(50)->pluck('title','route')->toArray();
         }else{
         }else{
             $keywords_sts = $keywordsInfo['customer_keywords'];
             $keywords_sts = $keywordsInfo['customer_keywords'];
             if(!empty($keywords_sts)){
             if(!empty($keywords_sts)){
-                $productKeywordModel = new Keyword();
+                $keywordModel = new Keyword();
                 $keywords_arr = explode("\n",$keywords_sts);
                 $keywords_arr = explode("\n",$keywords_sts);
                 $num = count($keywords_arr);
                 $num = count($keywords_arr);
                 if($num >= 50){
                 if($num >= 50){
-                    $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->whereIn('title',$keywords_arr)->limit(50)->pluck('title', 'route')->toArray();
+                    $list = $keywordModel::orderByRaw('LENGTH(title) ASC')->whereIn('title',$keywords_arr)->limit(50)->pluck('title', 'route')->toArray();
                     $list_num = count($list);
                     $list_num = count($list);
                     if($list_num < 50){
                     if($list_num < 50){
-                        $key_list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50 - $list_num)->pluck('title','route')->toArray();
+                        $key_list = $keywordModel::orderByRaw('LENGTH(title) ASC')->limit(50 - $list_num)->pluck('title','route')->toArray();
                     }
                     }
                     $list = array_merge($key_list,$list);
                     $list = array_merge($key_list,$list);
                 }else{
                 }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 = $keywordModel::orderByRaw('LENGTH(title) ASC')->whereIn('title',$keywords_arr)->pluck('title', 'route')->toArray();
+                    $key_list = $keywordModel::orderByRaw('LENGTH(title) ASC')->limit(50 - $num)->pluck('title','route')->toArray();
                     $list = array_merge($key_list,$list);
                     $list = array_merge($key_list,$list);
                 }
                 }
             }else{
             }else{
-                $productKeywordModel = new Keyword();
-                $list = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->limit(50)->pluck('title','route')->toArray();
+                $keywordModel = new Keyword();
+                $list = $keywordModel::orderByRaw('LENGTH(title) ASC')->limit(50)->pluck('title','route')->toArray();
             }
             }
         }
         }
         $data = [];
         $data = [];