From 0d02ee0aeeaa7c4df579a57b6f75e59c69a1ed26 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:22:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index 8c09bae..49e5b57 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -19,6 +19,7 @@
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.message.IMessageService;
import com.ycl.utils.MD5Util;
+import com.ycl.vo.message.MessageVO;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -85,7 +86,9 @@
public String sendMessage(Message message) {
Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
.eq(Message::getTargetTo, message.getTargetTo())
- .eq(Message::getTargetFrom, message.getTargetFrom()));
+ .eq(Message::getTargetFrom, message.getTargetFrom())
+ .eq(Message::getBody,message.getBody())
+ .eq(Message::getHead,message.getHead()));
if (savedMessage != null) {
messageMapper.deleteById(savedMessage);
}
@@ -195,7 +198,7 @@
}
@Override
- public Page<Message> list(MessageParam messageParam) {
+ public Page<MessageVO> list(MessageParam messageParam) {
Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
return messageMapper.selectMessagePage(page,messageParam);
}
--
Gitblit v1.8.0