diff --git a/app/common/utils/email/Mailbox.php b/app/common/utils/email/Mailbox.php
index bf57921..44e4ec2 100644
--- a/app/common/utils/email/Mailbox.php
+++ b/app/common/utils/email/Mailbox.php
@@ -119,7 +119,10 @@ class Mailbox
             imap_close($inbox);
             flg("✔ {$username}获取到新询盘邮件 {$count} 条 ...", false,'mailbox');
 
-            $mailboxModel->last_uid = max($uids);
+
+            if(empty($uids)){
+                $mailboxModel->last_uid = max($uids);
+            }
             $mailboxModel->last_fetch_at = time();
             $mailboxModel->save();
 
@@ -769,7 +772,7 @@ class Mailbox
             ->distinct()
             ->get();
         foreach ($emails as $email) {
-            $mailboxModel = EmailMailbox::where('username', $email->email)->first();
+            $mailboxModel = EmailMailbox::where('username', $email->mailto)->first();
             $this->fenpai($mailboxModel);
         }