From cefd1adb20b138926f5505b9558113cf23ead89e Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Thu, 13 Feb 2025 15:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84--=E6=96=B0=E5=A2=9E=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8--=E4=BF=AE=E6=94=B9--=E6=B7=BB=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/app/AppSystemController.java   | 6 ++++++
 .../main/resources/mapper/system/SysUserFollowMapper.xml    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
index 1f49599f..5eca856e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
@@ -1462,6 +1462,8 @@ public class AppSystemController extends BaseController {
     {
 
         Long userId = getUserId();
+        System.out.println("userId: "+userId+" followedUserId: "+followedUserId);
+
 
         // 删除关注数据
         userFollowService.deleteSysUserFollowByUserIdAndFollowedUserId(userId, followedUserId);
@@ -1510,6 +1512,10 @@ public class AppSystemController extends BaseController {
             sysUserFollow1.setFollowedUserId(userId);
             List<SysUserFollow> userFollowList1 = userFollowService.selectSysUserFollowList(sysUserFollow1);
 
+            System.out.println("userFollowList1: "+userFollowList1.size());
+            SysUserFollow userFollow = userFollowList1.get(0);
+            System.out.println("userFollow: "+userFollow + "status"+ userFollow.getFollowStatus());
+
             if(userFollowList1.size() > 0 && userFollowList1.get(0).getFollowStatus().equals("0")){
                 // 互相关注
                 sysUserFollow.setFollowStatus("1");
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
index e95a4f21..14118b98 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysUserFollowVo">
-        select id, user_id, followed_user_id, status, create_time, update_time from sys_user_follow
+        select id, user_id, followed_user_id, status, follow_status,create_time, update_time from sys_user_follow
     </sql>
 
     <select id="selectSysUserFollowList" parameterType="SysUserFollow" resultMap="SysUserFollowResult">
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="followedUserId != null "> and followed_user_id = #{followedUserId}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-             <if test="followStatus != null  and followStatus != ''"> and follow_status = #{followStatus}</if>
+            <if test="followStatus != null  and followStatus != ''"> and follow_status = #{followStatus}</if>
         </where>
     </select>