|
@@ -6,6 +6,7 @@ import com.ruoyi.app.domain.TbMemberMiddle;
|
|
|
import com.ruoyi.app.domain.vo.AppFamilyVo;
|
|
|
import com.ruoyi.app.domain.vo.AppMemberVo;
|
|
|
import com.ruoyi.app.service.ITbAppUserService;
|
|
|
+import com.ruoyi.app.service.ITbFamilyMemberService;
|
|
|
import com.ruoyi.app.service.ITbMemberMiddleService;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
@@ -36,6 +37,8 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
|
|
|
private ITbMemberMiddleService middleService;
|
|
|
@Autowired
|
|
|
private ITbAppUserService userService;
|
|
|
+ @Autowired
|
|
|
+ private ITbFamilyMemberService memberService;
|
|
|
|
|
|
/**
|
|
|
* 根据会员id获取家族列表
|
|
@@ -138,6 +141,17 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
|
|
|
.eq(TbFamily::getId, middle.getFamilyId())
|
|
|
.last("limit 1")
|
|
|
);
|
|
|
+ // 查出家族族长(创建者、群主)
|
|
|
+ if (family != null) {
|
|
|
+ List<AppMemberVo> memberVos = memberService.selectMemberList(new LambdaQueryWrapper<AppMemberVo>()
|
|
|
+ .eq(AppMemberVo::getFamilyId,family.getId())
|
|
|
+ .eq(AppMemberVo::getPatriarch,"Y")
|
|
|
+ );
|
|
|
+ if (memberVos.size() > 0) {
|
|
|
+ AppMemberVo vo = memberVos.get(0);
|
|
|
+ family.setPatriarchName(vo.getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
return family;
|
|
|
}
|
|
|
|