|
@@ -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) {
|