修改我的好友列表，修改家族成员管理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyController.java

@@ -110,7 +110,8 @@ public class TbFamilyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:family:query')" )
     @GetMapping(value = "/{id}" )
     public AjaxResult getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iTbFamilyService.getById(id));
+        TbFamily family = iTbFamilyService.getById(id);
+        return AjaxResult.success(family);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbMyFriends.java

@@ -57,5 +57,9 @@ public class TbMyFriends extends BaseEntity {
 
     @TableField(exist = false)
     private String nickName;
+    @TableField(exist = false)
+    private String pyCode;
+    @TableField(exist = false)
+    private String pyFirst;
 
 }

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

@@ -1,12 +1,15 @@
 package com.ruoyi.app.service.impl;
 
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.ruoyi.app.domain.TbMemberMiddle;
 import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.service.ITbMemberMiddleService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -118,6 +121,8 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
 
     @Override
     public List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo) {
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
+
         LambdaQueryWrapper<AppMemberVo> lqw = new LambdaQueryWrapper<>();
         if (memberVo.getFamilyId() == null) {
             return new ArrayList<>();
@@ -125,10 +130,10 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         lqw.eq(AppMemberVo::getFamilyId, memberVo.getFamilyId());
 
         if (StringUtils.isNotBlank(memberVo.getSearchValue())) {
-            lqw.like(AppMemberVo::getName,memberVo.getSearchValue()).or()
-                    .like(AppMemberVo::getNickName,memberVo.getSearchValue()).or()
-                    .like(AppMemberVo::getMobile,memberVo.getSearchValue()).or()
-                    .like(AppMemberVo::getQrcode,memberVo.getSearchValue());
+            lqw.and(
+                    i -> i.like(AppMemberVo::getName,memberVo.getSearchValue()).or()
+                    .like(AppMemberVo::getMobile,memberVo.getSearchValue())
+            );
         }
         return baseMapper.selectFamilyMember(lqw);
     }

ruoyi-system/src/main/resources/mapper/app/TbFamilyMemberMapper.xml

@@ -23,7 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectFamilyMember" resultType="com.ruoyi.app.domain.vo.AppMemberVo">
-        select u.mobile,u.qrcode,u.nick_name, m.name,m.gender,m.birthday,m.spouse,mi.status,
+        select u.mobile,u.qrcode,u.nick_name, m.name,m.gender,m.birthday,m.spouse_user_id,mi.status,m.state,
+        (select mm.name from tb_family_member mm where mm.app_user_id = m.spouse_user_id) spouse,
         mi.parent_id,(select me.name from tb_family_member me where mi.parent_id = me.id) parent_name,
         (select mm.name from tb_family_member mm where mm.app_user_id = (select me.spouse_user_id from tb_family_member me where mi.parent_id = me.id)) mother_name
         from tb_app_user u

ruoyi-system/src/main/resources/mapper/app/TbMyFriendsMapper.xml

@@ -18,12 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="listFriends" resultType="com.ruoyi.app.domain.TbMyFriends" parameterType="String">
         select * from (
-            select f.*,u.nick_name,u.qrcode,u.py_code
+            select f.*,u.nick_name,u.qrcode,u.py_code,u.py_first
             from tb_my_friends f left join tb_app_user u on f.app_user_id = u.id
             where f.friends_user_id = #{id}
             union all
-            select g.*,u.nick_name,u.qrcode,u.py_code
-            from tb_my_friends g left join tb_app_user u on g.app_user_id = u.id
+            select g.*,u.nick_name,u.qrcode,u.py_code,u.py_first
+            from tb_my_friends g left join tb_app_user u on g.friends_user_id = u.id
             where app_user_id = #{id}
         ) a where 1=1
         <if test="status != null and status != '' ">