From edf8db3dca9a66e6a14edf6e389e2004b36bcb16 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 10 May 2024 15:44:42 +0800 Subject: [PATCH] 1 --- server/mailserver/mail/mailmgr.go | 2 +- server/mailserver/player/player.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/server/mailserver/mail/mailmgr.go b/server/mailserver/mail/mailmgr.go index 7c5fa725..8e886592 100644 --- a/server/mailserver/mail/mailmgr.go +++ b/server/mailserver/mail/mailmgr.go @@ -170,7 +170,7 @@ func (this *mailMgr) CaGetAttachment(c *gin.Context) { mails := []common.Mail{} for _, str := range(mailIds) { m := this.getMail(str) - if m != nil { + if m != nil && m.IsValid(hum) { q5.AppendSlice(&mails, m) } } diff --git a/server/mailserver/player/player.go b/server/mailserver/player/player.go index d9308137..a9a8608e 100644 --- a/server/mailserver/player/player.go +++ b/server/mailserver/player/player.go @@ -85,9 +85,7 @@ func (this *player) MarkMails(mails []common.Mail) error { } func (this *player) GetAttachment(mails []common.Mail) error { - this.checkLock() - var resultErr error - return resultErr + return this.DeleteMails(mails) } func (this *player) DeleteMails(mails []common.Mail) error {