|
@@ -167,12 +167,14 @@ public class UserServiceImpl implements IUserService {
|
|
|
sysAnnouncementSendMapper.selectList(Wrappers.<SysAnnouncementSend>lambdaQuery()
|
|
|
.eq(SysAnnouncementSend::getUserId, user.getId())).forEach(sysAnnouncementSend -> {
|
|
|
SysAnnouncement sysAnnouncement = sysAnnouncementMapper.selectById(sysAnnouncementSend.getAnntId());
|
|
|
- MsgVO msgVO = new MsgVO()
|
|
|
- .setReadFlag(sysAnnouncementSend.getReadFlag())
|
|
|
- .setTitile(sysAnnouncement.getTitile())
|
|
|
- .setId(sysAnnouncement.getId())
|
|
|
- .setSendTime(sysAnnouncement.getSendTime())
|
|
|
- .setImgUrl(sysAnnouncement.getImgUrl()).setSender(sysAnnouncement.getSender());
|
|
|
+ MsgVO msgVO = new MsgVO();
|
|
|
+ if(null !=sysAnnouncement){
|
|
|
+ msgVO.setReadFlag(sysAnnouncementSend.getReadFlag())
|
|
|
+ .setTitile(sysAnnouncement.getTitile())
|
|
|
+ .setId(sysAnnouncement.getId())
|
|
|
+ .setSendTime(sysAnnouncement.getSendTime())
|
|
|
+ .setImgUrl(sysAnnouncement.getImgUrl()).setSender(sysAnnouncement.getSender());
|
|
|
+ }
|
|
|
msgVOList.add(msgVO);
|
|
|
});
|
|
|
return msgVOList;
|