Browse Source

修改

master
dimengzhe 2 years ago
parent
commit
77ef1937dc
  1. 11
      message-center-biz/src/main/java/com/yxt/messagecenter/biz/message/MessageService.java
  2. 4
      message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml

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

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

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

@ -235,11 +235,11 @@
m.msgTitle,
m.msgContent,
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.senderName,
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
LEFT JOIN message m ON ml.msgSid = m.sid
<where>

Loading…
Cancel
Save