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

gx



查看合并请求 !1072

@@ -400,10 +400,10 @@ 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');
-        $keywords_sts = trim($keywordsInfo['customer_keywords'],',');
+        $keywords_sts = $keywordsInfo['customer_keywords'];
         if(!empty($keywords_sts)){
         if(!empty($keywords_sts)){
             $productKeywordModel = new Keyword();
             $productKeywordModel = new Keyword();
-            $keywords_arr = explode(',',trim($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 = $productKeywordModel::orderByRaw('LENGTH(title) ASC')->whereIn('title',$keywords_arr)->limit(50)->pluck('title', 'route')->toArray();