Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -59,8 +59,8 @@ class KeywordVideoController extends BaseController
      * @time   :2023/8/18 10:58
      * @time   :2023/8/18 10:58
      */
      */
     public function searchParam(&$query){
     public function searchParam(&$query){
-        if(isset($this->map['project_name']) && is_array($this->map['project_name'])){
-            $query->where('gl_project.title','like','%'.$this->map['project_name'].'%');
+        if(isset($this->map['title']) && is_array($this->map['title'])){
+            $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         }
         if(isset($this->map['status'])){
         if(isset($this->map['status'])){
             $query->where('gl_keyword_video_task.status',$this->map['status']);
             $query->where('gl_keyword_video_task.status',$this->map['status']);

@@ -287,7 +287,8 @@ class ProjectLogic extends BaseLogic
             //更改域名
             //更改域名
             $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
             $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
         }
         }
-        $deploy_optimize['minor_languages'] = Arr::a2s( []);
+        $deploy_optimize['minor_languages'] = Arr::a2s($deploy_optimize['minor_languages'] ?? []);
+        $deploy_optimize['g_top_plan'] = Arr::a2s($deploy_optimize['g_top_plan'] ?? []);
         $deploy_optimize['minor_keywords'] = Arr::a2s(!empty($deploy_optimize['minor_keywords']) ? $deploy_optimize['minor_keywords'] : []);
         $deploy_optimize['minor_keywords'] = Arr::a2s(!empty($deploy_optimize['minor_keywords']) ? $deploy_optimize['minor_keywords'] : []);
         $deploy_optimize['special'] = !empty($deploy_optimize['special']) ? ','.trim($deploy_optimize['special'],',').',' : '';
         $deploy_optimize['special'] = !empty($deploy_optimize['special']) ? ','.trim($deploy_optimize['special'],',').',' : '';
         //是否更新了api_no
         //是否更新了api_no

@@ -19,7 +19,9 @@ class DeployOptimize extends Base
     public function getMinorLanguagesAttribute($value){
     public function getMinorLanguagesAttribute($value){
         return Arr::s2a($value);
         return Arr::s2a($value);
     }
     }
-
+    public function getGTopPlanAttribute($value){
+        return Arr::s2a($value);
+    }
     public static function clearCache($row){
     public static function clearCache($row){
         $cache_key = 'project_' . $row->original['domain'];
         $cache_key = 'project_' . $row->original['domain'];
         Cache::forget($cache_key);
         Cache::forget($cache_key);