修改点赞/取消返回点赞记录；修改成员时，姓名与昵称同步的问题

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

@@ -6,8 +6,10 @@ import com.ruoyi.app.annotation.LoginAppUser;
 import com.ruoyi.app.base.AppLoginUser;
 import com.ruoyi.app.controller.base.AppBaseController;
 import com.ruoyi.app.domain.TbAppUser;
+import com.ruoyi.app.domain.TbPublishComment;
 import com.ruoyi.app.domain.TbPublishThumbs;
 import com.ruoyi.app.domain.vo.AppMemberVo;
+import com.ruoyi.app.service.ITbMyPublishService;
 import com.ruoyi.app.service.ITbPublishThumbsService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
@@ -37,6 +39,7 @@ import java.util.List;
 public class PublishThumbsController extends AppBaseController {
 
     private final ITbPublishThumbsService thumbsService;
+    private final ITbMyPublishService publishService;
 
     /**
      * 点赞/取消
@@ -74,12 +77,13 @@ public class PublishThumbsController extends AppBaseController {
         } else { // 取消
             thumbsService.removeById(thumbs.getId());
         }
+        // 获取登录人的所有好友和所在家族的所有族友的id
+        List<Long> fids = publishService.getMyFrientIds(user.getUserId());
         // 点赞或取消后，返回点赞记录
-        TbPublishThumbs obj = thumbsService.getOne(new LambdaQueryWrapper<TbPublishThumbs>()
+        List<TbPublishThumbs> list = thumbsService.selectList(new LambdaQueryWrapper<TbPublishThumbs>()
                 .eq(TbPublishThumbs::getPublishId, publishId)
-                .eq(TbPublishThumbs::getAppUserId, appUserId)
-                .last("limit 1")
+                .in(fids.size() > 0, TbPublishThumbs::getAppUserId, fids)
         );
-        return AjaxResult.success(obj);
+        return AjaxResult.success(list);
     }
 }

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

@@ -67,6 +67,8 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         if (member == null) {
             member = new AppMemberVo();
             BeanUtils.copyBeanProp(member, memberVo);
+            // 新添加的手机 昵称和姓名同步
+            member.setNickName(member.getName());
         }else{
             member.setStatus(memberVo.getStatus());
             member.setName(memberVo.getName());
@@ -75,8 +77,6 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
             member.setSpouseUserId(memberVo.getSpouseUserId());
             member.setState(memberVo.getState());
             member.setFamilyId(memberVo.getFamilyId());
-            // 新添加的手机 昵称和姓名同步
-            member.setNickName(member.getName());
         }
         if (StringUtils.isNotBlank(memberVo.getMemberRemark())) {
             member.setMemberRemark(memberVo.getMemberRemark());