From bb66cc5ca79ddaf55ded8d3dcc8f44710d3d85ca Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 4 Jun 2025 18:00:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E7=94=A8=E6=88=B7=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/system/service/ISysUserService.java    | 2 ++
 .../com/bonus/system/service/impl/SysUserServiceImpl.java | 8 +++++++-
 .../java/com/bonus/system/warning/ScheduledTasks.java     | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java
index 1bb67c2..b59ceb0 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java
@@ -22,6 +22,8 @@ public interface ISysUserService {
      */
     public List<SysUser> selectUserList(SysUser user);
 
+    public List<SysUser> selectUserList4Job(SysUser user);
+
     /**
      * 根据条件分页查询已分配用户角色列表
      *
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
index 12b68e5..eaf0b1f 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
@@ -117,7 +117,9 @@ public class SysUserServiceImpl implements ISysUserService {
             String phone =user.getPhonenumber().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_");
             user.setPhonenumber(phone);
         }
-        user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
+        if (Objects.nonNull(SecurityUtils.getLoginUser()) && Objects.nonNull(SecurityUtils.getLoginUser().getSysUser())) {
+            user.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
+        }
         List<SysUser> sysUsers = userMapper.selectUserList(user);
         for (SysUser sysUser : sysUsers) {
             sysUser.setPhotoUrl(remoteFileService.getFullFileUrl(sysUser.getPhotoUrl()));
@@ -125,6 +127,10 @@ public class SysUserServiceImpl implements ISysUserService {
         return sysUsers;
     }
 
+    public List<SysUser> selectUserList4Job(SysUser user) {
+        return userMapper.selectUserList(user);
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      *
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/warning/ScheduledTasks.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/warning/ScheduledTasks.java
index e4491a5..12d47ce 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/warning/ScheduledTasks.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/warning/ScheduledTasks.java
@@ -30,10 +30,10 @@ public class ScheduledTasks {
     }
 
     // 每6个小时执行
-    @Scheduled(cron = "0 */6 * * *")
+    @Scheduled(fixedRate = 3600000)
     public void taskToChangeUserStatus() {
         System.out.println("用户状态修正任务开始执行，执行时间：" + LocalDateTime.now().format(formatter));
-        List<SysUser> sysUsers = userService.selectUserList(new SysUser());
+        List<SysUser> sysUsers = userService.selectUserList4Job(new SysUser());
         for (SysUser sysUser : sysUsers) {
             userService.setUserStatus(sysUser);
             userService.updateUser(sysUser);