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

Lyh server



查看合并请求 !1570

@@ -301,6 +301,9 @@ class ProjectController extends BaseController
                 $query = $query->where('gl_project_deploy_optimize.domain','!=',null);
                 $query = $query->where('gl_project_deploy_optimize.domain','!=',null);
             }
             }
         }
         }
+        if(isset($this->map['project_type'])){
+            $query = $query->where('gl_project.project_type',$this->map['project_type']);
+        }
         return $query;
         return $query;
     }
     }
 
 

@@ -26,7 +26,7 @@ class GoogleKeywordInsightDetail extends Base
     public function saveInsightDetail($project_id,$keyword,$data){
     public function saveInsightDetail($project_id,$keyword,$data){
         $saveData = [];
         $saveData = [];
         $textArr = array_column($data, 'text');
         $textArr = array_column($data, 'text');
-        $transData = $this->translateZh($textArr);
+        $transData = Translate::tran($textArr, 'zh');
         foreach ($data as $key => $val){
         foreach ($data as $key => $val){
             $saveData[] = [
             $saveData[] = [
                 'search'=>$keyword,
                 'search'=>$keyword,
@@ -43,15 +43,4 @@ class GoogleKeywordInsightDetail extends Base
         }
         }
         return $this->insertAll($saveData);
         return $this->insertAll($saveData);
     }
     }
-
-    /**
-     * @remark :翻译中文
-     * @name   :translateZh
-     * @author :lyh
-     * @method :post
-     * @time   :2025/3/25 17:21
-     */
-    public function translateZh($data){
-        return Translate::tran($data, 'zh');
-    }
 }
 }