正在显示
1 个修改的文件
包含
8 行增加
和
3 行删除
| @@ -204,6 +204,11 @@ class SyncSubmitTaskService | @@ -204,6 +204,11 @@ class SyncSubmitTaskService | ||
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | $config = InquiryFilterConfig::getCacheInfoByProjectId($project_id); | 206 | $config = InquiryFilterConfig::getCacheInfoByProjectId($project_id); |
| 207 | + //没配置 则默认开启且使用全局 | ||
| 208 | + if($config){ | ||
| 209 | + $config['is_global_rule'] = 1; | ||
| 210 | + $config['status'] = 1; | ||
| 211 | + } | ||
| 207 | //是否开启过滤 | 212 | //是否开启过滤 |
| 208 | if($config && $config['status']){ | 213 | if($config && $config['status']){ |
| 209 | //是否包含全局规则(就是project_id=1的配置) | 214 | //是否包含全局规则(就是project_id=1的配置) |
| @@ -262,7 +267,7 @@ class SyncSubmitTaskService | @@ -262,7 +267,7 @@ class SyncSubmitTaskService | ||
| 262 | //过滤邮箱 | 267 | //过滤邮箱 |
| 263 | if($config['filter_emails'] && !empty($data['data']['email'])){ | 268 | if($config['filter_emails'] && !empty($data['data']['email'])){ |
| 264 | foreach ($config['filter_emails'] as $filter_email){ | 269 | foreach ($config['filter_emails'] as $filter_email){ |
| 265 | - if($data['data']['email'] == $filter_email){ | 270 | + if(Str::contains($data['data']['email'], $filter_email)){ |
| 266 | throw new InquiryFilterException( '过滤邮箱:' . $filter_email); | 271 | throw new InquiryFilterException( '过滤邮箱:' . $filter_email); |
| 267 | } | 272 | } |
| 268 | } | 273 | } |
| @@ -270,7 +275,7 @@ class SyncSubmitTaskService | @@ -270,7 +275,7 @@ class SyncSubmitTaskService | ||
| 270 | //过滤电话 | 275 | //过滤电话 |
| 271 | if($config['filter_mobiles'] && !empty($data['data']['phone'])){ | 276 | if($config['filter_mobiles'] && !empty($data['data']['phone'])){ |
| 272 | foreach ($config['filter_mobiles'] as $filter_mobile){ | 277 | foreach ($config['filter_mobiles'] as $filter_mobile){ |
| 273 | - if($data['data']['phone'] == $filter_mobile){ | 278 | + if(Str::contains($data['data']['phone'], $filter_mobile)){ |
| 274 | throw new InquiryFilterException( '过滤电话:' . $filter_mobile); | 279 | throw new InquiryFilterException( '过滤电话:' . $filter_mobile); |
| 275 | } | 280 | } |
| 276 | } | 281 | } |
| @@ -278,7 +283,7 @@ class SyncSubmitTaskService | @@ -278,7 +283,7 @@ class SyncSubmitTaskService | ||
| 278 | //过滤姓名 | 283 | //过滤姓名 |
| 279 | if($config['filter_names'] && !empty($data['data']['name'])){ | 284 | if($config['filter_names'] && !empty($data['data']['name'])){ |
| 280 | foreach ($config['filter_names'] as $filter_name){ | 285 | foreach ($config['filter_names'] as $filter_name){ |
| 281 | - if($data['data']['name'] == $filter_name){ | 286 | + if( Str::contains($data['data']['name'], $filter_name)){ |
| 282 | throw new InquiryFilterException( '过滤姓名:' . $filter_name); | 287 | throw new InquiryFilterException( '过滤姓名:' . $filter_name); |
| 283 | } | 288 | } |
| 284 | } | 289 | } |
-
请 注册 或 登录 后发表评论