点赞评论消息通知 fix

community-service/src/main/java/com/tanpu/community/manager/NotificationManager.java

@@ -126,6 +126,9 @@ public class NotificationManager {
             if (NotificationTypeEnum.COMMENT_LIKE.getCode().equals(themeNotifyQo.getMessageType())) {
 
                 CommentEntity commentEntity = commentService.queryByCommentId(themeNotifyQo.getCommentId());
+                if (commentEntity!=null){
+                    themeNotifyQo.setContent(null);
+                }else {
                     themeNotifyQo.setFormerThemeId(commentEntity.getThemeId());
                     themeNotifyQo.setContent(commentEntity.getContent());
                     ThemeEntity themeEntity = themeService.queryByThemeId(commentEntity.getThemeId());
@@ -141,6 +144,8 @@ public class NotificationManager {
                         }
                     }
                 }
+
+            }
             // 外部话题
             if (StringUtils.isNotBlank(themeNotifyQo.getTopicId())) {
                 themeNotifyQo.setTopicTitle(topicService.queryTitleById(themeNotifyQo.getTopicId()));

community-service/src/main/java/com/tanpu/community/service/NotificationService.java

@@ -226,10 +226,12 @@ public class NotificationService {
     }
 
 
-    // 删除评论及缓存
+    // 删除评论及缓存,并更新
     public void deleteCommentNotify(String notifyUserId, String operatorId, String commentId, LocalDateTime commentTime) {
         // 物理删除
-        NotificationEntity commentNotify = notificationMapper.selectOne(new LambdaQueryWrapper<NotificationEntity>().eq(NotificationEntity::getTargetId, commentId));
+        NotificationEntity commentNotify = notificationMapper.selectOne(new LambdaQueryWrapper<NotificationEntity>()
+                .eq(NotificationEntity::getTargetId, commentId)
+                .eq(NotificationEntity::getMessageType, NotificationTypeEnum.COMMENT.getType()));
         NotificationEntity last = notificationMapper.selectOne(new LambdaQueryWrapper<NotificationEntity>().eq(NotificationEntity::getNotifiedUserId, notifyUserId)
                 .orderByDesc(NotificationEntity::getUpdateTime)
                 .last("limit 1"));