diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java index 836645c6e..3b7d67789 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java @@ -94,10 +94,6 @@ public class MailLogic { continue; } String mailItem = cMail.getMailItem(); - if("2100#15".equals(mailItem)){ - removeIds.add(cMail.getId()); - continue; - } if(mailItem != null && mailItem.contains("null")){ removeIds.add(cMail.getId()); continue; @@ -111,14 +107,6 @@ public class MailLogic { for(String removeId : removeIds){ mailManager.removeMail(removeId); } - //超过邮件上限, 删除时间最早的一封 - int size = cMailList.size(); - if (size > Global.MAIL_BOX_CAPACITY){ - cMailList.sort(Comparator.comparingInt(Mail::getSendTime)); - for(int i = 0; i < (size - Global.MAIL_BOX_CAPACITY); i++){ - cMailList.remove(0); - } - } cMailList.sort(Comparator.comparingInt(Mail::getIsTop).reversed()); getAllMailProtoList(cMailList,mailList); return mailList;