diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java b/modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java index 5a1e9c8a..dff9ab26 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/dao/MsgInnerRecordDao.java @@ -18,6 +18,6 @@ public interface MsgInnerRecordDao extends CrudDao { /** * 根据消息编号和接受者用户名更新读取状态 */ - public void updateReadStatus(MsgInnerRecord msgInnerRecord); + public long updateReadStatus(MsgInnerRecord msgInnerRecord); } \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java index 9d19ec28..2a014ce2 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/service/MsgInnerService.java @@ -158,7 +158,7 @@ public class MsgInnerService extends CrudService { BaseMsgContent msgContent = null; if (MsgPush.TYPE_PC.equals(type)){ msgContent = new PcMsgContent(); - msgContent.setContent("你有一条内部消息,请点击“详情”进行查阅。"); + msgContent.setContent("你有一条内部消息,点击“详情”进行查阅。"); ((PcMsgContent)msgContent).addButton(new String[]{ "详情", "/a/msg/msgInner/view?id="+msgInner.getId()}); }else if (MsgPush.TYPE_APP.equals(type)){ @@ -170,7 +170,7 @@ public class MsgInnerService extends CrudService { } if (msgContent != null){ msgContent.setTitle(msgInner.getMsgTitle()); - if (msgContent.getContent() != null){ + if (msgContent.getContent() == null){ msgContent.setContent("你有一条内部消息请查阅:" + StringUtils.abbr(msgInner.getMsgTitle(), 30)); } diff --git a/modules/core/src/main/resources/mappings/modules/msg/MsgInnerRecordDao.xml b/modules/core/src/main/resources/mappings/modules/msg/MsgInnerRecordDao.xml index dc56159e..55cb9413 100644 --- a/modules/core/src/main/resources/mappings/modules/msg/MsgInnerRecordDao.xml +++ b/modules/core/src/main/resources/mappings/modules/msg/MsgInnerRecordDao.xml @@ -12,4 +12,13 @@ ORDER BY ${sqlMap.order.toSql()} --> + + UPDATE ${_prefix}sys_msg_inner_record SET + read_status = #{readStatus}, + read_date = #{readDate} + WHERE msg_inner_id = #{msgInnerId} + AND receive_user_code = #{receiveUserCode} + AND read_date is null + + \ No newline at end of file