|
@@ -1,7 +1,6 @@
|
|
|
package com.fjhx.mail.service.message.impl;
|
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
-import cn.hutool.extra.spring.SpringUtil;
|
|
|
import cn.hutool.http.HttpUtil;
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
@@ -24,7 +23,6 @@ import com.fjhx.mail.entity.message.dto.DeleteBatchMailDto;
|
|
|
import com.fjhx.mail.entity.message.dto.DeleteMailDto;
|
|
|
import com.fjhx.mail.entity.message.dto.SendDto;
|
|
|
import com.fjhx.mail.entity.message.dto.SetSeenDto;
|
|
|
-import com.fjhx.mail.entity.message.po.MessageAttachment;
|
|
|
import com.fjhx.mail.entity.my.vo.MessageVo;
|
|
|
import com.fjhx.mail.entity.personal.po.PersonalFolder;
|
|
|
import com.fjhx.mail.entity.personal.po.PersonalMailbox;
|
|
@@ -339,16 +337,16 @@ public class InfoServiceImpl implements InfoService {
|
|
|
}
|
|
|
List<Long> messageIds = records.stream().map(MessageVo::getId).collect(Collectors.toList());
|
|
|
|
|
|
- //赋值邮件附件信息
|
|
|
- List<MessageAttachment> messageAttachmentList = messageAttachmentMapper.getList(Wrappers.query().in("ma.message_id", messageIds), dto.getType());
|
|
|
- String obsUrl = SpringUtil.getProperty("obs.url");
|
|
|
- messageAttachmentList.forEach(item -> item.setUrl(obsUrl + item.getUrl()));
|
|
|
-
|
|
|
- Map<Long, List<MessageAttachment>> MessageAttachmentMap = messageAttachmentList.stream().collect(Collectors.groupingBy(MessageAttachment::getMessageId));
|
|
|
- for (MessageVo record : records) {
|
|
|
- List<MessageAttachment> messageAttachments = MessageAttachmentMap.get(record.getId());
|
|
|
- record.setMessageAttachmentList(messageAttachmentList);
|
|
|
- }
|
|
|
+// //赋值邮件附件信息
|
|
|
+// List<MessageAttachment> messageAttachmentList = messageAttachmentMapper.getList(Wrappers.query().in("ma.message_id", messageIds), dto.getType());
|
|
|
+// String obsUrl = SpringUtil.getProperty("obs.url");
|
|
|
+// messageAttachmentList.forEach(item -> item.setUrl(obsUrl + item.getUrl()));
|
|
|
+//
|
|
|
+// Map<Long, List<MessageAttachment>> MessageAttachmentMap = messageAttachmentList.stream().collect(Collectors.groupingBy(MessageAttachment::getMessageId));
|
|
|
+// for (MessageVo record : records) {
|
|
|
+// List<MessageAttachment> messageAttachments = MessageAttachmentMap.get(record.getId());
|
|
|
+// record.setMessageAttachmentList(messageAttachmentList);
|
|
|
+// }
|
|
|
|
|
|
|
|
|
//赋值客户信息
|