1111

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/interaction/MemberInteractionMapper.java

@@ -8,6 +8,8 @@ import cn.iocoder.yudao.module.member.dal.dataobject.interaction.MemberInteracti
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface MemberInteractionMapper extends BaseMapperX<MemberInteractionDO> {
 
@@ -24,10 +26,11 @@ public interface MemberInteractionMapper extends BaseMapperX<MemberInteractionDO
     }
 
     default MemberInteractionDO selectLatest(Long receiverId) {
-        return selectOne(new LambdaQueryWrapperX<MemberInteractionDO>()
+        List<MemberInteractionDO> list = selectList(new LambdaQueryWrapperX<MemberInteractionDO>()
                 .eq(MemberInteractionDO::getReceiverId, receiverId)
                 .orderByDesc(MemberInteractionDO::getId)
                 .last("LIMIT 1"));
+        return list.isEmpty() ? null : list.get(0);
     }
 
     default int markAllRead(Long receiverId) {

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/interaction/MemberInteractionServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.member.service.interaction;
 
-import cn.hutool.core.collection.IterUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -87,7 +88,14 @@ public class MemberInteractionServiceImpl implements MemberInteractionService {
         }
         List<Long> actorIds = rows.stream().map(MemberInteractionDO::getActorId).distinct().collect(Collectors.toList());
         List<MemberExtBO> members = memberUserService.getUserExtList(actorIds);
-        Map<Long, MemberExtBO> memberMap = IterUtil.toMap(members, MemberExtBO::getMemberId);
+        Map<Long, MemberExtBO> memberMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(members)) {
+            for (MemberExtBO member : members) {
+                if (member != null && member.getMemberId() != null) {
+                    memberMap.put(member.getMemberId(), member);
+                }
+            }
+        }
 
         return rows.stream().map(row -> {
             AppInteractionRespVO vo = new AppInteractionRespVO();