From f2c09097fee911a8052a5f77d5fd8ec9756b59a7 Mon Sep 17 00:00:00 2001
From: Diyu0904 <1819728964@qq.com>
Date: Sat, 22 Feb 2025 10:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=89=E4=B8=9D=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/domain/entity/SysUser.java    | 10 ++++++
 .../impl/SysUserAttentionServiceImpl.java     | 36 ++++++++++++++-----
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java b/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java
index 2395b5c..cf3564c 100644
--- a/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java
+++ b/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java
@@ -120,6 +120,8 @@ public class SysUser extends BaseEntity
      */
     private Double wallet;
 
+    private Boolean isAttention;
+
 
     public SysUser()
     {
@@ -405,4 +407,12 @@ public class SysUser extends BaseEntity
                 ", freePoints=" + freePoints +
                 '}';
     }
+
+    public Boolean getAttention() {
+        return isAttention;
+    }
+
+    public void setAttention(Boolean attention) {
+        isAttention = attention;
+    }
 }
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java
index c2c6816..dac4506 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java
@@ -36,9 +36,6 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
     @Autowired
     private ModelMapper modelMapper;
 
-    @Autowired
-    private MallProductLikeMapper mallProductLikeMapper;
-
     @Autowired
     private SysUserAttentionMapper sysUserAttentionMapper;
 
@@ -138,16 +135,26 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
     public PageInfo<SysUser> selectAttentionPage(PageVo pageVo) {
 
         PageHelper pageHelper = new PageHelper();
-        pageHelper.startPage(pageVo.getPageNumber(),pageVo.getPageSize());
+        pageHelper.startPage(pageVo.getPageNumber(), pageVo.getPageSize());
 
-        if (pageVo.getType() == null){
+        Long userIdMax = SecurityUtils.getUserIdMax();
+        if (pageVo.getType() == null) {
 
-            pageVo.setType(SecurityUtils.getUserIdMax());
+            pageVo.setType(userIdMax);
 
         }
         //条件构造器
         List<SysUser> sysUserList = sysUserMapper.selectUserPage(pageVo.getType());
 
+        for (SysUser sysUser : sysUserList) {
+
+            if (userIdMax == 0L) {
+                sysUser.setAttention(false);
+            } else {
+                sysUser.setAttention(selectAttention(sysUser.getUserId()));
+            }
+
+        }
 
         return new PageInfo<SysUser>(sysUserList);
     }
@@ -156,17 +163,28 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
     public PageInfo<SysUser> selectToAttentionPage(PageVo pageVo) {
 
         PageHelper pageHelper = new PageHelper();
-        pageHelper.startPage(pageVo.getPageNumber(),pageVo.getPageSize());
+        pageHelper.startPage(pageVo.getPageNumber(), pageVo.getPageSize());
 
-        if (pageVo.getType() == null){
+        Long userIdMax = SecurityUtils.getUserIdMax();
+        if (pageVo.getType() == null) {
 
-            pageVo.setType(SecurityUtils.getUserIdMax());
+            pageVo.setType(userIdMax);
 
         }
 
         //条件构造器
         List<SysUser> sysUserList = sysUserMapper.selectToUserPage(pageVo.getType());
 
+        for (SysUser sysUser : sysUserList) {
+
+            if (userIdMax == 0L) {
+                sysUser.setAttention(false);
+            } else {
+                sysUser.setAttention(selectAttention(sysUser.getUserId()));
+            }
+
+        }
+
 
         return new PageInfo<SysUser>(sysUserList);
     }