From d4f3d79b7c01963b7c90a0dfb0d8ad0d170c7c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Thu, 25 Apr 2024 11:32:20 +0800
Subject: [PATCH] init

---
 .../java/com/ruoyi/xq/service/impl/UserServiceImpl.java   | 8 ++++----
 .../com/ruoyi/xq/service/impl/UserStatusServiceImpl.java  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
index 508eb02..180d1b1 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
@@ -122,13 +122,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
         result.setUserPictureList(userPicturesList.stream().map(UserPictures::getPicture).collect(Collectors.toList()));
         result.setOpenVip(user.getOpenVip());
         result.setVipType(user.getVipType());
+        UserAuth userAuth = userAuthService.getByUserId(userId);
+        UserAuthMinVo authMinVo = BeanConvertUtil.convertTo(userAuth, UserAuthMinVo::new);
+        result.setUserAuthInfo(authMinVo);
         Long currentUserId = LoginHelper.getUserId();
         if(userId.equals(currentUserId)){
             return result;
         }
-        User currentUser = this.getById(currentUserId);
-        UserAuthMinVo authMinVo = BeanConvertUtil.convertTo(currentUser, UserAuthMinVo::new);
-        result.setUserAuthInfo(authMinVo);
         // TODO 登录时间
         boolean star = userStarService.existsStar(currentUserId, userId);
         result.setStar(star);
@@ -270,7 +270,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
             record.setBirthdayStr(BirthdayUtil.getMinBirthday(record.getBirthday()));
             record.setAge(BirthdayUtil.getAge(record.getBirthday()));
         }
-        return null;
+        return result;
     }
 
     @Override
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStatusServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStatusServiceImpl.java
index fb34d22..c076f6b 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStatusServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserStatusServiceImpl.java
@@ -54,6 +54,7 @@ public class UserStatusServiceImpl extends ServiceImpl<UserStatusMapper,UserStat
         update.setId(userStatus.getId());
         update.setAllowTransMobile(req.getAllowTransMobile());
         update.setAllowTransWx(req.getAllowTransWx());
+        update.setShowAvatar(req.getShowAvatar());
         if(req.getPushVip() != null && req.getPushVip() == 1){
             User user = userService.getById(req.getUserId());
             if(!user.getOpenVip()){