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

gxai



查看合并请求 !1813

@@ -71,7 +71,7 @@ class OptimizeSetKeywordSync extends Command
      */
      */
     public function syncKeyword($project_id, $keywords)
     public function syncKeyword($project_id, $keywords)
     {
     {
-        $keywords = explode("\n", $keywords);
+        $keywords = explode("\r\n", $keywords);
         $keywords = array_unique(array_filter($keywords));
         $keywords = array_unique(array_filter($keywords));
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $keywordModel = new Keyword();
         $keywordModel = new Keyword();

@@ -157,7 +157,7 @@ class Keyword extends Base
                 continue;
                 continue;
             }
             }
             $info = $this->read(['title'=>$v],['id']);
             $info = $this->read(['title'=>$v],['id']);
-            if($info === false){
+            if($info == false){
                 $param['project_id'] = $project_id;
                 $param['project_id'] = $project_id;
                 $param['title'] = $v;
                 $param['title'] = $v;
                 $param['first_word'] = $this->first_word($param['title']);
                 $param['first_word'] = $this->first_word($param['title']);