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

Master server



查看合并请求 !920

@@ -79,6 +79,9 @@ class KeywordController extends BaseController
         if(!empty($map['keyword_title'])){
         if(!empty($map['keyword_title'])){
             $map['keyword_title'] = ['like','%'.$map['keyword_title'].'%'];
             $map['keyword_title'] = ['like','%'.$map['keyword_title'].'%'];
         }
         }
+        if(empty($map['is_video_keyword'])){
+            unset($map['is_video_keyword']);
+        }
         $map['route'] = ['<>',''];
         $map['route'] = ['<>',''];
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
         $map['deleted_at'] = null;
         $map['deleted_at'] = null;

@@ -277,6 +277,7 @@ class UserLoginLogic
         $info['service_duration'] = $project['deploy_build']['service_duration'] ?? 0;
         $info['service_duration'] = $project['deploy_build']['service_duration'] ?? 0;
         $info['is_comment'] = $project['deploy_build']['is_comment'] ?? 0;
         $info['is_comment'] = $project['deploy_build']['is_comment'] ?? 0;
         $info['remain_day'] = $project['remain_day'] ?? 0;
         $info['remain_day'] = $project['remain_day'] ?? 0;
+        $info['project_created_at'] = $project['created_at'];
         $info['type'] = $project['type'] ?? 1;
         $info['type'] = $project['type'] ?? 1;
         if($info['is_customized'] == 1){
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
             $info['is_visualization'] = json_decode($project['is_visualization']);
@@ -292,6 +293,7 @@ class UserLoginLogic
             $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
             $is_amp = $amp_info ? $amp_info['amp_status'] : 0;
         }
         }
         $info['is_amp'] = $is_amp;
         $info['is_amp'] = $is_amp;
+        $info['is_three_code'] = $project['is_three_code'] ?? 0;
         return $info;
         return $info;
     }
     }