去除修改昵称或姓名时同步的问题

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

@@ -151,7 +151,7 @@ public class TbAppUserController extends BaseController {
         }
         member = new AppMemberVo();
         BeanUtils.copyBeanProp(member,memberVo);
-        // 昵称和姓名同步
+        // 新增时昵称和姓名同步
         if (StringUtils.isNotBlank(member.getNickName())) {
             member.setName(member.getNickName());
         }
@@ -171,10 +171,10 @@ public class TbAppUserController extends BaseController {
         }
         AppMemberVo member = iTbAppUserService.getMember("user",null,memberVo.getMobile());
         BeanUtils.copyBeanProp(member,memberVo);
-        // 昵称和姓名同步
-        if (StringUtils.isNotBlank(member.getNickName())) {
-            member.setName(member.getNickName());
-        }
+        // 修改时昵称与姓名 不用同步更新
+//        if (StringUtils.isNotBlank(member.getNickName())) {
+//            member.setName(member.getNickName());
+//        }
         return toAjax(iTbAppUserService.saveOrUpdate(member) ? 1 : 0);
     }
 

ruoyi-app/src/main/java/com/ruoyi/app/controller/AppUserController.java

@@ -82,10 +82,10 @@ public class AppUserController extends AppBaseController {
         if (memberVo.getUserId() == null) {
             return AjaxResult.error("userId不能为空");
         }
-        // 昵称与姓名同步更新
-        if (StringUtils.isNotBlank(memberVo.getNickName())){
-            memberVo.setName(memberVo.getNickName());
-        }
+        // 修改时昵称与姓名 不用同步更新
+//        if (StringUtils.isNotBlank(memberVo.getNickName())){
+//            memberVo.setName(memberVo.getNickName());
+//        }
         return toAjax(userService.saveOrUpdate(memberVo) ? 1 : 0);
     }
 }

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

@@ -78,8 +78,8 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         if (StringUtils.isNotBlank(memberVo.getMemberRemark())) {
             member.setMemberRemark(memberVo.getMemberRemark());
         }
-        // 昵称和姓名同步
-        member.setNickName(member.getName());
+        // 添加成员 昵称和姓名不用同步
+//        member.setNickName(member.getName());
         if(!userService.saveOrUpdate(member)){
             return AjaxResult.error("保存失败");
         }

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

@@ -82,7 +82,7 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
             middle.setMemberId(memberVo.getMemberId());
 
             // 新成员名字与会员昵称同步
-            memberVo.setName(memberVo.getNickName());
+//            memberVo.setName(memberVo.getNickName());
         } else {
             if ("2".equals(middle.getStatus())){
                 return AjaxResult.error("已在该家族，不允许重复加入");