From 48cf18615df02c12bd6a156b3abd879847465918 Mon Sep 17 00:00:00 2001 From: yangduo Date: Tue, 29 Apr 2025 19:12:14 +0800 Subject: [PATCH] fix --- webapp/controller/MailController.class.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webapp/controller/MailController.class.php b/webapp/controller/MailController.class.php index 88f759b..74d07f2 100644 --- a/webapp/controller/MailController.class.php +++ b/webapp/controller/MailController.class.php @@ -85,7 +85,7 @@ class MailController $nowtime = time(); $mailrows = $mailconn->execQuery( - ' SELECT mail_id, subject, content, attachments FROM t_mail WHERE 1=1 AND deleted=0 ' . + ' SELECT mail_id, subject, content, attachments, expiretime FROM t_mail WHERE 1=1 AND deleted=0 ' . ' AND (user_reg_start_time=0 OR user_reg_end_time=0 OR (user_reg_start_time<:createtime AND user_reg_end_time>:createtime)) ' . ' AND expiretime>:nowtime ' . ' AND (recipients="" OR recipients LIKE "%:accountid%");', @@ -151,13 +151,12 @@ class MailController foreach ($newmails as $newitem) { $ret = $conn->execScript( 'INSERT INTO t_inbox(accoun_id, mail_id, state, expiretime, createtime, modifytime) ' . - ' VALUES(:account_id, :mailid, 0, :status, :expiretime, :create_time, :modify_time) ' . - ' ON DUPLICATE KEY UPDATE account_id=:account_id, mail_id=:mailid, state=:status, expiretime=:expiretime, modifytime=:modify_time;', + ' VALUES(:account_id, :mailid, 0, :expiretime, :create_time, :modify_time) ' . + ' ON DUPLICATE KEY UPDATE account_id=:account_id, mail_id=:mailid, state=0, expiretime=:expiretime, modifytime=:modify_time;', array( ':account_id' => $account_id, ':mailid' => $newitem['mail_id'], ':expiretime' => $newitem['expiretime'], - ':status' => 0, ':create_time' => $nowtime, ':modify_time' => $nowtime )