diff --git a/agri-system/src/main/java/com/agri/system/domain/SysMessage.java b/agri-system/src/main/java/com/agri/system/domain/SysMessage.java index 7457b23..f58dca8 100644 --- a/agri-system/src/main/java/com/agri/system/domain/SysMessage.java +++ b/agri-system/src/main/java/com/agri/system/domain/SysMessage.java @@ -82,4 +82,7 @@ public class SysMessage extends BaseEntity @JsonSerialize(using = ToStringSerializer.class) private Long sortNewId; + @TableField(exist = false) + private Integer unreadCount; + } diff --git a/agri-system/src/main/java/com/agri/system/service/impl/SysMessageServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/SysMessageServiceImpl.java index 126843d..14da3e0 100644 --- a/agri-system/src/main/java/com/agri/system/service/impl/SysMessageServiceImpl.java +++ b/agri-system/src/main/java/com/agri/system/service/impl/SysMessageServiceImpl.java @@ -101,6 +101,9 @@ public class SysMessageServiceImpl extends ServiceImpl getMsgOverview(SysMessage sysMessage) { + if (!SecurityUtils.isAdmin()) { + sysMessage.setReceiver(SecurityUtils.getUserId()); + } return baseMapper.getMsgOverview(sysMessage); } } diff --git a/agri-system/src/main/resources/mapper/system/SysMessageMapper.xml b/agri-system/src/main/resources/mapper/system/SysMessageMapper.xml index f805a23..674c7ef 100644 --- a/agri-system/src/main/resources/mapper/system/SysMessageMapper.xml +++ b/agri-system/src/main/resources/mapper/system/SysMessageMapper.xml @@ -126,30 +126,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file