|
@@ -203,6 +203,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
|
|
|
}
|
|
|
lqw.eq(AppMemberVo::getFamilyId, memberVo.getFamilyId());
|
|
|
lqw.isNotNull(AppMemberVo::getParentId);
|
|
|
+ lqw.eq(StringUtils.isNotBlank(memberVo.getGender()),AppMemberVo::getGender,memberVo.getGender());
|
|
|
if (StringUtils.isNotBlank(memberVo.getSearchValue())) {
|
|
|
lqw.and(
|
|
|
i -> i.like(AppMemberVo::getName,memberVo.getSearchValue()).or()
|
|
@@ -230,6 +231,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
|
|
|
}
|
|
|
lqw.eq(AppMemberVo::getFamilyId, memberVo.getFamilyId());
|
|
|
lqw.eq(AppMemberVo::getStatus,"2");
|
|
|
+ lqw.eq(StringUtils.isNotBlank(memberVo.getGender()), AppMemberVo::getGender,memberVo.getGender());
|
|
|
if (StringUtils.isNotBlank(memberVo.getSearchValue())) {
|
|
|
lqw.and(
|
|
|
i -> i.like(AppMemberVo::getName,memberVo.getSearchValue()).or()
|