修复族友圈的评论和点赞，只有当前家族族友才能看到的问题

ruoyi-app/src/main/java/com/ruoyi/app/controller/PublishCommentController.java

@@ -57,20 +57,8 @@ public class PublishCommentController extends AppBaseController {
         comment.setCreateBy(user.getUserId().toString());
         comment.setCreateTime(new Date());
         if (commentService.save(comment)) {
-            Long familyId = null;
-            // 获取登录人所在的家族id
-            TbFamilyMember member = memberService.getOne(new LambdaQueryWrapper<TbFamilyMember>()
-                    .eq(TbFamilyMember::getAppUserId,user.getUserId())
-                    .last("limit 1")
-            );
-            if (member != null) {
-                TbFamily family = familyService.myFamily(member.getId());
-                if (family != null) {
-                    familyId = family.getId();
-                }
-            }
             // 获取登录人的所有好友和所在家族的所有族友的id
-            List<Long> fids = publishService.getMyFrientIds(user.getUserId(),familyId);
+            List<Long> fids = publishService.getMyFrientIds(user.getUserId());
             //返回评论列表
             List<TbPublishComment> list = commentService.selectList(new LambdaQueryWrapper<TbPublishComment>()
                     .eq(TbPublishComment::getPublishId, comment.getPublishId())

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

@@ -34,8 +34,7 @@ public interface ITbMyPublishService extends IService<TbMyPublish> {
     /**
      * 获取我的所有好友、族友
      * @param appUserId
-     * @param familyId
      * @return
      */
-    List<Long> getMyFrientIds(Long appUserId, Long familyId);
+    List<Long> getMyFrientIds(Long appUserId);
 }

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

@@ -396,7 +396,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
             // 手机号更改并且手机号已存在
             if (!memberVo1.getMobile().equals(member.getMobile()) &&
                     memberVo2.getMobile().equals(member.getMobile())) {
-                return AjaxResult.error("修改的手机号已存在");
+                return AjaxResult.error("手机号已被注册");
             }
         }
 

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

@@ -129,19 +129,8 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
     public TbMyPublish getPublish(Long id, Long appUserId) {
         TbMyPublish publish = this.getById(id);
         if (publish != null) {
-            Long familyId = null;
-            TbFamilyMember member = memberService.getOne(new LambdaQueryWrapper<TbFamilyMember>()
-                    .eq(TbFamilyMember::getAppUserId,appUserId)
-                    .last("limit 1")
-            );
-            if (member != null) {
-                TbFamily family = familyService.myFamily(member.getId());
-                if (family != null) {
-                    familyId = family.getId();
-                }
-            }
             // 只能看好友和族友的点赞、评论
-            List<Long> fids = getMyFrientIds(appUserId, familyId);
+            List<Long> fids = getMyFrientIds(appUserId);
 
             // 图片列表
             List<TbPublishImg> publishImgs = imgService.list(new LambdaQueryWrapper<TbPublishImg>()
@@ -339,7 +328,7 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
             ids.add(item.getId());
         });
         // 只能看好友和族友的点赞、评论
-        List<Long> fids = getMyFrientIds(appUserId, familyId);
+        List<Long> fids = getMyFrientIds(appUserId);
 
         // 族友圈中放入图片列表 点赞列表 评论列表
         List<TbPublishImg> imgList = imgService.list(new LambdaQueryWrapper<TbPublishImg>()
@@ -385,11 +374,10 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
     /**
      * 获取好友、族友的id
      * @param appUserId
-     * @param familyId
      * @return
      */
     @Override
-    public List<Long> getMyFrientIds(Long appUserId, Long familyId){
+    public List<Long> getMyFrientIds(Long appUserId){
         List<Long> fids = new ArrayList<>();
         if (appUserId != null) {
             // 好友列表
@@ -403,16 +391,15 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
                 });
             }
         }
-        if (familyId != null) {
-            // 族友列表
-            AppMemberVo memberVo = new AppMemberVo();
-            memberVo.setFamilyId(familyId);
-            List<AppMemberVo> memberList = memberService.selectFamilyMember(memberVo);
-            if (memberList.size() > 0) {
-                memberList.forEach(item -> {
-                    fids.add(item.getUserId());
-                });
-            }
+        // 族友列表
+        List<AppMemberVo> memberList = memberService.myMemberList(new LambdaQueryWrapper<AppMemberVo>()
+                .eq(AppMemberVo::getUserId, appUserId)
+                .eq(AppMemberVo::getStatus, "2")
+        );
+        if (memberList.size() > 0) {
+            memberList.forEach(item -> {
+                fids.add(item.getUserId());
+            });
         }
         return fids;
     }