@@ -50,6 +50,7 @@ public class TbMyFriendsController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(TbMyFriends tbMyFriends)
{
+ tbMyFriends.setStatus("2");
List<TbMyFriends> list = iTbMyFriendsService.pageList(tbMyFriends);
return getDataTable(list);
}
@@ -53,7 +53,7 @@ public class TPersonalModelController extends BaseController {
startPage();
LambdaQueryWrapper<TPersonalModel> lqw = new LambdaQueryWrapper<TPersonalModel>();
if (StringUtils.isNotBlank(tPersonalModel.getContents())){
- lqw.eq(TPersonalModel::getContents ,tPersonalModel.getContents());
+ lqw.like(TPersonalModel::getContents ,tPersonalModel.getContents());
if (StringUtils.isNotBlank(tPersonalModel.getEnable())){
lqw.eq(TPersonalModel::getEnable ,tPersonalModel.getEnable());
@@ -47,6 +47,7 @@ public class TbMyFriendsServiceImpl extends ServiceImpl<TbMyFriendsMapper, TbMyF
if (StringUtils.isNotBlank(tbMyFriends.getStatus())){
status = tbMyFriends.getStatus();
+ startPage();
List<TbMyFriends> list = baseMapper.listFriends(uid,status,search);
return list;
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from tb_family f
left join tb_member_middle mi on f.id = mi.family_id
left join tb_family_member m on m.id = mi.member_id
- where m.app_user_id = #{userId}
+ where m.app_user_id = #{userId} and mi.status = '2'
</select>
<select id="selectByMemberId" resultType="com.ruoyi.app.domain.vo.AppFamilyVo">
select f.id,mi.id middle_id,m.id member_id,mi.acquiesce,mi.generation,mi.patriarch,