修改族友圈点赞和评论不显示族友信息的问题

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbFamilyMemberMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.app.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ruoyi.app.domain.TbFamilyMember;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -19,5 +20,6 @@ import java.util.List;
 public interface TbFamilyMemberMapper extends BaseMapper<TbFamilyMember> {
 
     List<AppMemberVo> selectFamilyMember(@Param(Constants.WRAPPER) LambdaQueryWrapper<AppMemberVo> wrapper);
+    List<AppMemberVo> selectFamilyMember(@Param(Constants.WRAPPER) QueryWrapper<AppMemberVo> wrapper);
     List<AppMemberVo> selectFamilyTree(@Param(Constants.WRAPPER) LambdaQueryWrapper<AppMemberVo> wrapper);
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyMemberService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.app.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.app.domain.TbFamilyMember;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.app.domain.TbMemberMiddle;
@@ -22,6 +23,7 @@ public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
     AppMemberVo getMemberDetail(Long familyId, Long memberId);
     AjaxResult saveOrUpdate(AppMemberVo memberVo);
     List<AppMemberVo> myMemberList(LambdaQueryWrapper<AppMemberVo> lqw);
+    List<AppMemberVo> myMemberList(QueryWrapper<AppMemberVo> lqw);
     List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo);
     List<AppMemberVo> selectMemberNotTree(AppMemberVo memberVo);

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.app.service.impl;
 
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.ruoyi.app.domain.TbMemberMiddle;
 import com.ruoyi.app.domain.vo.AppMemberVo;
@@ -221,6 +222,11 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
         return baseMapper.selectFamilyMember(lqw);
     }
+    @Override
+    public List<AppMemberVo> myMemberList(QueryWrapper<AppMemberVo> lqw){
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
+        return baseMapper.selectFamilyMember(lqw);
+    }
 
     @Override
     public List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo) {

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbMyPublishServiceImpl.java

@@ -1,9 +1,11 @@
 package com.ruoyi.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.app.domain.*;
+import com.ruoyi.app.domain.vo.AppFamilyVo;
 import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.*;
 import com.ruoyi.common.constant.HttpStatus;
@@ -391,9 +393,24 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
                 });
             }
         }
+        List<Long> familyIds = new ArrayList<>();
+        // 获取登录人所在的家族id
+         TbFamilyMember member = memberService.getOne(new LambdaQueryWrapper<TbFamilyMember>()
+             .eq(TbFamilyMember::getAppUserId,appUserId)
+             .last("limit 1")
+         );
+         if (member != null) {
+             List<AppFamilyVo> familyVoList = familyService.selectByMemberId(member.getId());
+             if (familyVoList.size() > 0) {
+                familyVoList.forEach(item -> {
+                    familyIds.add(item.getId());
+                });
+             }
+         }
+
         // 族友列表
         List<AppMemberVo> memberList = memberService.myMemberList(new LambdaQueryWrapper<AppMemberVo>()
-                .eq(AppMemberVo::getUserId, appUserId)
+                .in(AppMemberVo::getFamilyId, familyIds)
                 .eq(AppMemberVo::getStatus, "2")
         );
         if (memberList.size() > 0) {