获取我的默认家族加入状态判断

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

@@ -98,6 +98,7 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
         // 是否已加入过家族
         List<TbMemberMiddle> middleList = middleService.list(new LambdaQueryWrapper<TbMemberMiddle>()
                 .eq(TbMemberMiddle::getMemberId,memberVo.getMemberId())
+                .eq(TbMemberMiddle::getStatus,"2")
         );
 
         if (middleList.size() == 0) {
@@ -164,6 +165,7 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
     public TbFamily myFamily(Long memberId) {
         TbMemberMiddle middle = middleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
                 .eq(TbMemberMiddle::getMemberId, memberId)
+                .eq(TbMemberMiddle::getStatus,"2")
                 .eq(TbMemberMiddle::getAcquiesce, "Y")
                 .last("limit 1")
         );
@@ -171,6 +173,7 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
             // 没有默认家族，则设置第一个家族为默认
             middle = middleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
                     .eq(TbMemberMiddle::getMemberId, memberId)
+                    .eq(TbMemberMiddle::getStatus,"2")
                     .last("limit 1")
             );
             if (middle == null) {