other_project/message-center
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
dimengzhe
2023-03-03 16:16:53 +08:00
parent df8cf3a560
commit 77ef1937dc
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
View File

@@ -323,15 +323,15 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageBean.removeAll(Collections.singleton(null)); messageBean.removeAll(Collections.singleton(null));
if (!messageBean.isEmpty()) { if (!messageBean.isEmpty()) {
for (MessageTypeVo message : messageBean) { for (MessageTypeVo message : messageBean) {
if (message.getMsgType().equals("抄送")) { if (message.getMsgType().contains("抄送")) {
messageDto.setMsgTypeSid(message.getMsgTypeSid()); messageDto.setMsgTypeSid(message.getMsgTypeSid());
messageDto.setMsgType(message.getMsgType()); messageDto.setMsgType(message.getMsgType());
} }
} }
} }
if (StringUtils.isNotBlank(dto.getTaskId())) { /* if (StringUtils.isNotBlank(dto.getTaskId())) {
messageDto.setTaskId(dto.getTaskId()); messageDto.setTaskId(dto.getTaskId());
} }*/
messageDto.setMsgTitle(msgTitle); messageDto.setMsgTitle(msgTitle);
messageDto.setMsgContent(msgContent); messageDto.setMsgContent(msgContent);
messageDto.setMsgSource("抄送"); messageDto.setMsgSource("抄送");
@@ -969,15 +969,12 @@ public class MessageService extends MybatisBaseService<MessageMapper, Message> {
messageBean.removeAll(Collections.singleton(null)); messageBean.removeAll(Collections.singleton(null));
if (!messageBean.isEmpty()) { if (!messageBean.isEmpty()) {
for (MessageTypeVo message : messageBean) { for (MessageTypeVo message : messageBean) {
if (message.getMsgType().equals("抄送")) { if (message.getMsgType().contains("分享")) {
messageDto.setMsgTypeSid(message.getMsgTypeSid()); messageDto.setMsgTypeSid(message.getMsgTypeSid());
messageDto.setMsgType(message.getMsgType()); messageDto.setMsgType(message.getMsgType());
} }
} }
} }
if (StringUtils.isNotBlank(dto.getTaskId())) {
messageDto.setTaskId(dto.getTaskId());
}
messageDto.setMsgTitle(msgTitle); messageDto.setMsgTitle(msgTitle);
messageDto.setMsgContent(msgContent); messageDto.setMsgContent(msgContent);
messageDto.setMsgSource("分享"); messageDto.setMsgSource("分享");

4
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
View File

@@ -235,11 +235,11 @@
m.msgTitle, m.msgTitle,
m.msgContent, m.msgContent,
ml.state, ml.state,
DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%m:%s') as sendTime, DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%i:%s') as sendTime,
m.msgTargetUri as moduleAction, m.msgTargetUri as moduleAction,
m.senderName, m.senderName,
m.msgSource, m.msgSource,
DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%m:%s') as redTime DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%i:%s') as redTime
FROM message_list ml FROM message_list ml
LEFT JOIN message m ON ml.msgSid = m.sid LEFT JOIN message m ON ml.msgSid = m.sid
<where> <where>