From 0c7568c19ebdb540d5cca242eb9e95231d1a0dd7 Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期五, 20 九月 2024 17:58:02 +0800
Subject: [PATCH] CRM邮箱配置

---
 src/com/yc/crm/mail/service/MailServiceImpl.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/com/yc/crm/mail/service/MailServiceImpl.java b/src/com/yc/crm/mail/service/MailServiceImpl.java
index b34970e..da71dd3 100644
--- a/src/com/yc/crm/mail/service/MailServiceImpl.java
+++ b/src/com/yc/crm/mail/service/MailServiceImpl.java
@@ -288,7 +288,11 @@
             Date nowTime = new Date();
             for (int i = 0; i < messages.length; i++) {
                 m = messages[i];
-                LocalDate sendDate = m.getSentDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                Date time = m.getReceivedDate();
+                if (time == null) {
+                    continue;
+                }
+                LocalDate sendDate = time.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
                 if ((sendDate.isAfter(startTime) || sendDate.isEqual(startTime)) &&
                         (sendDate.isBefore(endTime) || sendDate.isEqual(endTime))) {//鏃堕棿娈佃幏鍙栭偖浠�
                     t482101HEntity mail = new t482101HEntity();
@@ -417,7 +421,10 @@
                 BodyPart bodyPart = mimeMultipart.getBodyPart(i);
                 if (bodyPart.isMimeType("image/*")) {//鍥剧墖
                     MailFileEntity.MailBodyPart p = new MailFileEntity.MailBodyPart();
-                    String fileName = MimeUtility.decodeText(bodyPart.getFileName());
+                    String fileName = "xxx.jpg";
+                    if (StringUtils.isNotBlank(bodyPart.getFileName())) {
+                        fileName = MimeUtility.decodeText(bodyPart.getFileName());
+                    }
                     p.setFileName(fileName);//鏈変簺閭欢娌℃湁鎵╁睍鍚�
                     String cId = ((IMAPBodyPart) bodyPart).getContentID();//鑾峰彇cId
                     if (StringUtils.isNotBlank(cId)) {//鍦ㄦ湁鎵╁睍鍚嶆椂鍊�
@@ -426,7 +433,7 @@
                             p.setFileName(cId);//鏈変簺閭欢娌℃湁鎵╁睍鍚�
                         }
                     }
-                    if (StringUtils.isBlank(p.getFileType()) && StringUtils.isNotBlank(fileName)) {
+                    if (StringUtils.isBlank(p.getFileType())) {
                         if (fileName.lastIndexOf(".") != -1) {
                             p.setFileType(fileName.substring(fileName.lastIndexOf(".") + 1));
                         }
@@ -445,7 +452,10 @@
                     part.add(p);
                 } else if (Part.ATTACHMENT.equalsIgnoreCase(bodyPart.getDisposition())) {//闄勪欢
                     MailFileEntity.MailBodyPart p = new MailFileEntity.MailBodyPart();
-                    String fileName = MimeUtility.decodeText(bodyPart.getFileName());
+                    String fileName = "";
+                    if (StringUtils.isNotBlank(bodyPart.getFileName())) {
+                        fileName = MimeUtility.decodeText(bodyPart.getFileName());
+                    }
                     p.setFileName(fileName);
                     if (StringUtils.isNotBlank(fileName)) {
                         p.setFileType(fileName.substring(fileName.lastIndexOf(".") + 1));

--
Gitblit v1.8.0