修改我的好友列表，修改后台添加家族成员

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

@@ -10,6 +10,7 @@ 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.utils.bean.BeanUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -113,15 +114,6 @@ public class TbFamilyMemberController extends BaseController {
         if (StringUtils.isBlank(memberVo.getMobile())){
             return AjaxResult.error("手机号不能为空");
         }
-        if (StringUtils.isNotBlank(memberVo.getMobile())) {
-            TbAppUser appUser = userService.getOne(new LambdaQueryWrapper<TbAppUser>()
-                    .eq(TbAppUser::getMobile, memberVo.getMobile())
-                    .last("limit 1")
-            );
-            if (appUser!=null && StringUtils.isNotBlank(appUser.getMobile())) {
-                return AjaxResult.error("该手机号已经存在");
-            }
-        }
         // 后台添加，状态直接为通过 2
         memberVo.setStatus("2");
         return toAjax(iTbFamilyMemberService.saveOrUpdate(memberVo) ? 1 : 0);

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

@@ -63,9 +63,17 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         AppMemberVo member = userService.getMember("member",null,memberVo.getMobile());
         if (member == null) {
             member = new AppMemberVo();
+            BeanUtils.copyBeanProp(member, memberVo);
+        }else{
+            member.setStatus(memberVo.getStatus());
+            member.setName(memberVo.getName());
+            member.setBirthday(memberVo.getBirthday());
+            member.setGender(memberVo.getGender());
+            member.setSpouseUserId(memberVo.getSpouseUserId());
+            member.setState(memberVo.getState());
+            member.setFamilyId(memberVo.getFamilyId());
         }
 
-        BeanUtils.copyBeanProp(member, memberVo);
         if (StringUtils.isBlank(member.getNickName())) {
             member.setNickName(member.getName());
         }
@@ -82,10 +90,13 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
             TbMemberMiddle item = new TbMemberMiddle();
             item.setFamilyId(member.getFamilyId());
             item.setMemberId(member.getMemberId());
-            if (StringUtils.isNotBlank(member.getStatus())) {
-                item.setStatus(member.getStatus());
+            if (StringUtils.isNotBlank(memberVo.getStatus())) {
+                item.setStatus(memberVo.getStatus());
             }
             memberMiddleService.save(item);
+        } else {
+            memberMiddle.setStatus(memberVo.getStatus());
+            memberMiddleService.updateById(memberMiddle);
         }
         return true;
     }

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

@@ -22,13 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 f.create_by,f.create_time,f.update_by,f.update_time,f.remark,
                 u.nick_name,u.qrcode,u.py_code,u.py_first,u.avatar
             from tb_my_friends f left join tb_app_user u on f.app_user_id = u.id
-            where f.friends_user_id = 7
+            where f.friends_user_id = #{id}
             union all
             select g.id,g.friends_user_id as app_user_id,g.app_user_id as friends_user_id,g.status,
                 g.create_by,g.create_time,g.update_by,g.update_time,g.remark,
                 u.nick_name,u.qrcode,u.py_code,u.py_first,u.avatar
             from tb_my_friends g left join tb_app_user u on g.friends_user_id = u.id
-            where app_user_id = 7
+            where app_user_id = #{id}
         ) a where 1=1
         <if test="status != null and status != '' ">
            and a.status = #{status}