From e39f863f6cbe5b709fc9b05e2d6e165680348fb8 Mon Sep 17 00:00:00 2001
From: Diyu0904 <1819728964@qq.com>
Date: Sat, 22 Feb 2025 11:23:14 +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

---
 .../impl/SysUserAttentionServiceImpl.java     | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

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 dac4506..242185a 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
@@ -18,6 +18,7 @@ import com.mcwl.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -138,6 +139,12 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
         pageHelper.startPage(pageVo.getPageNumber(), pageVo.getPageSize());
 
         Long userIdMax = SecurityUtils.getUserIdMax();
+
+        if (userIdMax == 0L) {
+
+            return new PageInfo<SysUser>(new ArrayList<SysUser>());
+        }
+
         if (pageVo.getType() == null) {
 
             pageVo.setType(userIdMax);
@@ -148,12 +155,11 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
 
         for (SysUser sysUser : sysUserList) {
 
-            if (userIdMax == 0L) {
-                sysUser.setAttention(false);
-            } else {
+            if (sysUser != null){
                 sysUser.setAttention(selectAttention(sysUser.getUserId()));
             }
 
+
         }
 
         return new PageInfo<SysUser>(sysUserList);
@@ -166,6 +172,12 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
         pageHelper.startPage(pageVo.getPageNumber(), pageVo.getPageSize());
 
         Long userIdMax = SecurityUtils.getUserIdMax();
+
+        if (userIdMax == 0L) {
+
+            return new PageInfo<SysUser>(new ArrayList<SysUser>());
+        }
+
         if (pageVo.getType() == null) {
 
             pageVo.setType(userIdMax);
@@ -177,12 +189,11 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
 
         for (SysUser sysUser : sysUserList) {
 
-            if (userIdMax == 0L) {
-                sysUser.setAttention(false);
-            } else {
+            if (sysUser != null){
                 sysUser.setAttention(selectAttention(sysUser.getUserId()));
             }
 
+
         }