正在显示
2 个修改的文件
包含
3 行增加
和
2 行删除
@@ -90,7 +90,7 @@ class AutoMail { | @@ -90,7 +90,7 @@ class AutoMail { | ||
90 | if(in_array(strtolower($item['from']),$this->black_emails)){ | 90 | if(in_array(strtolower($item['from']),$this->black_emails)){ |
91 | if (!isset($this->filter[$item['email_id']])){ | 91 | if (!isset($this->filter[$item['email_id']])){ |
92 | // 找到邮箱 | 92 | // 找到邮箱 |
93 | - $e = $this->db->value(listsSql::first(dbWhere(['id'=>$item['email_id']]),'email')); | 93 | + $e = $this->db->value(\Model\emailSql::first($item['email_id'],'`email`')); |
94 | // 是否是ai邮件 | 94 | // 是否是ai邮件 |
95 | $this->filter[$item['email_id']] = | 95 | $this->filter[$item['email_id']] = |
96 | $this->db->count("select count(*) from `hot_mail` where ".dbWhere(['email'=> $e])); | 96 | $this->db->count("select count(*) from `hot_mail` where ".dbWhere(['email'=> $e])); |
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | 2 | ||
3 | namespace Event; | 3 | namespace Event; |
4 | 4 | ||
5 | +use Model\emailSql; | ||
5 | use Model\folderSql; | 6 | use Model\folderSql; |
6 | use Model\listsSql; | 7 | use Model\listsSql; |
7 | use Swlib\Saber; | 8 | use Swlib\Saber; |
@@ -222,7 +223,7 @@ class syncMail { | @@ -222,7 +223,7 @@ class syncMail { | ||
222 | if(!empty($data['from'])){ | 223 | if(!empty($data['from'])){ |
223 | // 是否是ai邮件 | 224 | // 是否是ai邮件 |
224 | if($this->db->count("select count(*) from `hot_mail` where ".dbWhere([ | 225 | if($this->db->count("select count(*) from `hot_mail` where ".dbWhere([ |
225 | - 'email'=> $this->db->value(listsSql::first(dbWhere(['id'=>$data['email_id']]),'email')) | 226 | + 'email'=> $this->db->value(emailSql::first($data['email_id'],'`email`')) |
226 | ]))){ | 227 | ]))){ |
227 | // 是否在黑名单中 | 228 | // 是否在黑名单中 |
228 | if($this->db->count("select count(*) from `ai_black_email` where ".dbWhere(['email'=>$data['from']]))){ | 229 | if($this->db->count("select count(*) from `ai_black_email` where ".dbWhere(['email'=>$data['from']]))){ |
-
请 注册 或 登录 后发表评论