From e25f47cd73c1314201c4ff706ff98306e7c5998d Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Sun, 31 Mar 2024 16:40:36 +0800
Subject: [PATCH] 123

---
 .../src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java   | 2 +-
 .../com/ruoyi/cai/service/impl/UserFollowServiceImpl.java   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java
index 51485ce5..4c0adfbe 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/auth/CaiLoginManager.java
@@ -171,7 +171,7 @@ public class CaiLoginManager {
             }
             userService.update(Wrappers.lambdaUpdate(User.class)
                     .eq(User::getId, user.getId())
-                    .eq(User::getInviteId, inviteUser.getId()));
+                    .set(User::getInviteId, inviteUser.getId()));
             UserInvite check = userInviteService.getByUserId(user.getId());
             if(check == null){
                 UserInvite userInvite = new UserInvite();
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java
index 135ad027..529986a8 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java
@@ -11,6 +11,7 @@ import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;
 import com.ruoyi.cai.dto.app.query.star.BatchStarReq;
 import com.ruoyi.cai.dto.app.vo.user.UserBaseVo;
 import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList;
+import com.ruoyi.cai.enums.GenderEnum;
 import com.ruoyi.cai.mapper.UserFollowMapper;
 import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.service.UserCountService;
@@ -113,6 +114,11 @@ public class UserFollowServiceImpl extends ServiceImpl<UserFollowMapper, UserFol
         if(starOrVisitorReq.getToUserId().equals(fromUserId)){
             throw new ServiceException("不能关注自己哦");
         }
+        User toUser = userService.getById(starOrVisitorReq.getToUserId());
+        // 男用户不能关注男用户
+        if(GenderEnum.MAN.getCode().equals(user.getGender()) && GenderEnum.MAN.getCode().equals(toUser.getGender())){
+            throw new ServiceException("无法不能关注男用户哦");
+        }
         this.remove(Wrappers.lambdaQuery(UserFollow.class)
                 .eq(UserFollow::getUserId,fromUserId)
                 .eq(UserFollow::getFollowUser, starOrVisitorReq.getToUserId()));