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

@@ -56,8 +56,6 @@ class UserLoginLogic
         }
         }
         $projectModel = new Project();
         $projectModel = new Project();
         $project_list = $projectModel->list(['id'=>['in',$projectArr],'delete_status'=>0],'id',['id','title']);
         $project_list = $projectModel->list(['id'=>['in',$projectArr],'delete_status'=>0],'id',['id','title']);
-        //登录选择项目的有效时间
-        Cache::add('login-project-'.$this->param['mobile'],1,300);
         return $this->success($project_list);
         return $this->success($project_list);
     }
     }
 
 
@@ -69,9 +67,6 @@ class UserLoginLogic
      * @time   :2023/6/17 16:43
      * @time   :2023/6/17 16:43
      */
      */
     public function projectLogin(){
     public function projectLogin(){
-        if(!Cache::get('login-project-'.$this->param['mobile'])){
-            $this->fail('当前用户选择项目有限时间已过期');
-        }
         //获取项目详情
         //获取项目详情
         $info = $this->assembleParam($this->param['mobile'],$this->param['project_id']);
         $info = $this->assembleParam($this->param['mobile'],$this->param['project_id']);
         if(isset($info['token']) && !empty($info['token'])){
         if(isset($info['token']) && !empty($info['token'])){
@@ -181,7 +176,7 @@ class UserLoginLogic
         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']);
         }
         }
-
+        $info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority'];
         //是否开通AMP
         //是否开通AMP
         $is_amp = 0;
         $is_amp = 0;
         if(!empty($project['deploy_optimize']['domain'])){
         if(!empty($project['deploy_optimize']['domain'])){
@@ -280,7 +275,7 @@ class UserLoginLogic
         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']);
         }
         }
-
+        $info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority'];
         //是否开通AMP
         //是否开通AMP
         $is_amp = 0;
         $is_amp = 0;
         if(!empty($project['deploy_optimize']['domain'])){
         if(!empty($project['deploy_optimize']['domain'])){

@@ -204,6 +204,11 @@ class SyncSubmitTaskService
         }
         }
 
 
         $config = InquiryFilterConfig::getCacheInfoByProjectId($project_id);
         $config = InquiryFilterConfig::getCacheInfoByProjectId($project_id);
+        //没配置 则默认开启且使用全局
+        if($config){
+            $config['is_global_rule'] = 1;
+            $config['status'] = 1;
+        }
         //是否开启过滤
         //是否开启过滤
         if($config && $config['status']){
         if($config && $config['status']){
             //是否包含全局规则(就是project_id=1的配置)
             //是否包含全局规则(就是project_id=1的配置)
@@ -262,7 +267,7 @@ class SyncSubmitTaskService
             //过滤邮箱
             //过滤邮箱
             if($config['filter_emails'] && !empty($data['data']['email'])){
             if($config['filter_emails'] && !empty($data['data']['email'])){
                 foreach ($config['filter_emails'] as $filter_email){
                 foreach ($config['filter_emails'] as $filter_email){
-                    if($data['data']['email'] == $filter_email){
+                    if(Str::contains($data['data']['email'], $filter_email)){
                         throw new InquiryFilterException( '过滤邮箱：' . $filter_email);
                         throw new InquiryFilterException( '过滤邮箱：' . $filter_email);
                     }
                     }
                 }
                 }
@@ -270,7 +275,7 @@ class SyncSubmitTaskService
             //过滤电话
             //过滤电话
             if($config['filter_mobiles'] && !empty($data['data']['phone'])){
             if($config['filter_mobiles'] && !empty($data['data']['phone'])){
                 foreach ($config['filter_mobiles'] as $filter_mobile){
                 foreach ($config['filter_mobiles'] as $filter_mobile){
-                    if($data['data']['phone'] == $filter_mobile){
+                    if(Str::contains($data['data']['phone'], $filter_mobile)){
                         throw new InquiryFilterException( '过滤电话：' . $filter_mobile);
                         throw new InquiryFilterException( '过滤电话：' . $filter_mobile);
                     }
                     }
                 }
                 }
@@ -278,7 +283,7 @@ class SyncSubmitTaskService
             //过滤姓名
             //过滤姓名
             if($config['filter_names'] && !empty($data['data']['name'])){
             if($config['filter_names'] && !empty($data['data']['name'])){
                 foreach ($config['filter_names'] as $filter_name){
                 foreach ($config['filter_names'] as $filter_name){
-                    if($data['data']['name'] == $filter_name){
+                    if( Str::contains($data['data']['name'], $filter_name)){
                         throw new InquiryFilterException( '过滤姓名：' . $filter_name);
                         throw new InquiryFilterException( '过滤姓名：' . $filter_name);
                     }
                     }
                 }
                 }