From 7a4f61cf5e8d42d24907ccc3d7345d25012d3a55 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 14 Apr 2026 16:43:50 +0800
Subject: [PATCH] 通知公告新增阅读用户&详细
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index e649fab..ba14cde 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
-import javax.validation.Validator;
+import jakarta.validation.Validator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -238,7 +238,7 @@
@Override
public void checkUserDataScope(Long userId)
{
- if (!SysUser.isAdmin(SecurityUtils.getUserId()))
+ if (!SecurityUtils.isAdmin())
{
SysUser user = new SysUser();
user.setUserId(userId);
@@ -326,7 +326,7 @@
@Override
public int updateUserStatus(SysUser user)
{
- return userMapper.updateUser(user);
+ return userMapper.updateUserStatus(user.getUserId(), user.getStatus());
}
/**
@@ -374,7 +374,7 @@
@Override
public int resetPwd(SysUser user)
{
- return userMapper.updateUser(user);
+ return userMapper.resetUserPwd(user.getUserId(), user.getPassword());
}
/**
@@ -528,6 +528,7 @@
checkUserDataScope(u.getUserId());
deptService.checkDeptDataScope(user.getDeptId());
user.setUserId(u.getUserId());
+ user.setDeptId(u.getDeptId());
user.setUpdateBy(operName);
userMapper.updateUser(user);
successNum++;
--
Gitblit v1.9.3