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

gx数据



查看合并请求 !1441

@@ -224,6 +224,7 @@ class OptimizeController extends BaseController
             'gl_project_deploy_optimize.backlink AS backlink',
             'gl_project_deploy_optimize.ai_video AS ai_video',
             'gl_project_deploy_optimize.api_no AS api_no',
+            'gl_project_deploy_optimize.first_compliance_time AS first_compliance_time',
             'gl_domain_info.amp_status AS amp_status',
             'gl_domain_info.domain AS domain',
         ];

@@ -662,6 +662,9 @@ class ProductController extends BaseController
         if(isset($this->map['created_uid'])){
             $query = $query->where('created_uid',$this->map['created_uid']);
         }
+        if(isset($this->map['six_read'])){
+            $query = $query->where('six_read',$this->map['six_read']);
+        }
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
             if($this->user['project_id'] == 2059){
                 $query->where('send_time', '>=' ,$this->param['start_at'].' 00:00:00')->where('send_time', '<=' ,$this->param['end_at'].' 59:59:59');