正在显示
1 个修改的文件
包含
0 行增加
和
6 行删除
| @@ -272,7 +272,6 @@ class MailListV2Es extends Base { | @@ -272,7 +272,6 @@ class MailListV2Es extends Base { | ||
| 272 | if($fids && !empty($assign['from'])){ | 272 | if($fids && !empty($assign['from'])){ | 
| 273 | if($folder=='发件箱'){ | 273 | if($folder=='发件箱'){ | 
| 274 | $query = [ | 274 | $query = [ | 
| 275 | - 'query' =>[ | ||
| 276 | 'bool' => [ | 275 | 'bool' => [ | 
| 277 | 'must' => [ | 276 | 'must' => [ | 
| 278 | ['terms'=>['folder_id'=>$fids]], | 277 | ['terms'=>['folder_id'=>$fids]], | 
| @@ -282,18 +281,15 @@ class MailListV2Es extends Base { | @@ -282,18 +281,15 @@ class MailListV2Es extends Base { | ||
| 282 | ]] | 281 | ]] | 
| 283 | ] | 282 | ] | 
| 284 | ] | 283 | ] | 
| 285 | - ] | ||
| 286 | ]; | 284 | ]; | 
| 287 | }else{ | 285 | }else{ | 
| 288 | $query = [ | 286 | $query = [ | 
| 289 | - 'query' =>[ | ||
| 290 | 'bool' => [ | 287 | 'bool' => [ | 
| 291 | 'must' => [ | 288 | 'must' => [ | 
| 292 | ['terms'=>['folder_id'=>$fids]], | 289 | ['terms'=>['folder_id'=>$fids]], | 
| 293 | ['terms'=>['from.email'=>$assign['from']]], | 290 | ['terms'=>['from.email'=>$assign['from']]], | 
| 294 | ] | 291 | ] | 
| 295 | ] | 292 | ] | 
| 296 | - ] | ||
| 297 | ]; | 293 | ]; | 
| 298 | } | 294 | } | 
| 299 | } | 295 | } | 
| @@ -304,7 +300,6 @@ class MailListV2Es extends Base { | @@ -304,7 +300,6 @@ class MailListV2Es extends Base { | ||
| 304 | 300 | ||
| 305 | if($query && $afids){ | 301 | if($query && $afids){ | 
| 306 | return [ | 302 | return [ | 
| 307 | - 'query' =>[ | ||
| 308 | 'bool' => [ | 303 | 'bool' => [ | 
| 309 | 'must' => [ | 304 | 'must' => [ | 
| 310 | $query | 305 | $query | 
| @@ -313,7 +308,6 @@ class MailListV2Es extends Base { | @@ -313,7 +308,6 @@ class MailListV2Es extends Base { | ||
| 313 | ['terms'=>['folder_id'=>$afids]] | 308 | ['terms'=>['folder_id'=>$afids]] | 
| 314 | ] | 309 | ] | 
| 315 | ] | 310 | ] | 
| 316 | - ] | ||
| 317 | ]; | 311 | ]; | 
| 318 | }else if($afids){ | 312 | }else if($afids){ | 
| 319 | return ['terms'=>['folder_id'=>$afids]]; | 313 | return ['terms'=>['folder_id'=>$afids]]; | 
- 
请 注册 或 登录 后发表评论