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

@@ -64,8 +64,7 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/7/28 17:11
      * @time   :2023/7/28 17:11
      */
      */
     public function getProjectInfo($id){
     public function getProjectInfo($id){
-        $info = $this->model->with('payment')->with('deploy_build')->with('deploy_optimize')->with('online_check')
-            ->with('project_after')->where(['id'=>$id])->first()->toArray();
+        $info = $this->model->with(['payment', 'deploy_build', 'deploy_optimize', 'online_check', 'project_after','inquiry_filter_config'])->where(['id'=>$id])->first()->toArray();
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['online_check']['name'] = (new Manage())->getName($info['online_check']['created_manage_id'] ?? 0);
         $info['deploy_optimize']['minor_keywords'] = !empty($info['deploy_optimize']['minor_keywords']) ? json_decode($info['deploy_optimize']['minor_keywords']) : [];
         $info['deploy_optimize']['minor_keywords'] = !empty($info['deploy_optimize']['minor_keywords']) ? json_decode($info['deploy_optimize']['minor_keywords']) : [];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];
         $info['init_domain'] = $this->getInitDomain($info['serve_id'])['domain'];

@@ -16,5 +16,12 @@ class InquiryFilterConfig extends Base
     //设置关联表名
     //设置关联表名
     protected $table = 'gl_project_inquiry_filter_config';
     protected $table = 'gl_project_inquiry_filter_config';
 
 
-
+    protected $casts = [
+        'filter_countries' => 'array',
+        'filter_contents' => 'array',
+        'filter_referers' => 'array',
+        'filter_emails' => 'array',
+        'filter_mobiles' => 'array',
+        'filter_names' => 'array',
+    ];
 }
 }

@@ -207,6 +207,18 @@ class Project extends Base
         return self::hasOne(After::class, 'project_id', 'id');
         return self::hasOne(After::class, 'project_id', 'id');
     }
     }
 
 
+
+    /**
+     * 询盘过滤配置
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     * @author zbj
+     * @date 2024/1/19
+     */
+    public function inquiry_filter_config()
+    {
+        return self::hasOne(InquiryFilterConfig::class, 'project_id', 'id');
+    }
+
     /**
     /**
      * 域名
      * 域名
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      * @return \Illuminate\Database\Eloquent\Relations\HasOne