fix: 修复消息设为已读错误

Author: Charles7c

continew-module-system/src/main/java/top/continew/admin/system/service/MessageLogService.java

@@ -27,14 +27,6 @@
  */
 public interface MessageLogService {
 
-    /**
-     * 新增
-     *
-     * @param userIds   用户 ID 列表
-     * @param messageId 消息 ID
-     */
-    void addWithMessageId(List<Long> userIds, Long messageId);
-
     /**
      * 新增
      *

continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageLogServiceImpl.java

@@ -39,24 +39,13 @@ public class MessageLogServiceImpl implements MessageLogService {
 
     private final MessageLogMapper baseMapper;
 
-    @Override
-    public void addWithMessageId(List<Long> userIdList, Long messageId) {
-        if (CollUtil.isEmpty(userIdList)) {
-            return;
-        }
-        List<MessageLogDO> list = userIdList.stream()
-            .map(userId -> new MessageLogDO(userId, messageId, LocalDateTime.now()))
-            .toList();
-        baseMapper.insert(list);
-    }
-
     @Override
     public void addWithUserId(List<Long> messageIds, Long userId) {
         if (CollUtil.isEmpty(messageIds)) {
             return;
         }
         List<MessageLogDO> list = messageIds.stream()
-            .map(messageId -> new MessageLogDO(userId, messageId, LocalDateTime.now()))
+            .map(messageId -> new MessageLogDO(messageId, userId, LocalDateTime.now()))
             .toList();
         baseMapper.insert(list);
     }

continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java

@@ -67,12 +67,10 @@ public PageResp<MessageResp> page(MessageQuery query, PageQuery pageQuery) {
 
     @Override
     public void readMessage(List<Long> ids, Long userId) {
-        if (CollUtil.isEmpty(ids)) {
-            // 查询当前用户的未读消息
-            List<MessageDO> list = baseMapper.selectUnreadListByUserId(userId);
-            ids = list.stream().map(MessageDO::getId).toList();
-        }
-        messageLogService.addWithMessageId(ids, userId);
+        // 查询当前用户的未读消息
+        List<MessageDO> list = baseMapper.selectUnreadListByUserId(userId);
+        List<Long> unreadIds = list.stream().map(MessageDO::getId).toList();
+        messageLogService.addWithUserId(CollUtil.intersection(unreadIds, ids).stream().toList(), userId);
     }
 
     @Override