From 50fc2989eeda1e5bbdf0a67dd15fa545db2370ed Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 25 Mar 2026 13:03:12 +0800
Subject: [PATCH] 修复typescript版多表代码生成报错问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 99fbb35..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());
}
/**
@@ -344,14 +344,25 @@
/**
* 修改用户头像
*
- * @param userName 用户名
+ * @param userId 用户ID
* @param avatar 头像地址
* @return 结果
*/
@Override
- public boolean updateUserAvatar(String userName, String avatar)
+ public boolean updateUserAvatar(Long userId, String avatar)
{
- return userMapper.updateUserAvatar(userName, avatar) > 0;
+ return userMapper.updateUserAvatar(userId, avatar) > 0;
+ }
+
+ /**
+ * 更新用户登录信息（IP和登录时间）
+ *
+ * @param user 用户信息
+ * @return 结果
+ */
+ public boolean updateLoginInfo(SysUser user)
+ {
+ return userMapper.updateLoginInfo(user) > 0;
}
/**
@@ -363,20 +374,20 @@
@Override
public int resetPwd(SysUser user)
{
- return userMapper.updateUser(user);
+ return userMapper.resetUserPwd(user.getUserId(), user.getPassword());
}
/**
* 重置用户密码
*
- * @param userName 用户名
+ * @param userId 用户ID
* @param password 密码
* @return 结果
*/
@Override
- public int resetUserPwd(String userName, String password)
+ public int resetUserPwd(Long userId, String password)
{
- return userMapper.resetUserPwd(userName, password);
+ return userMapper.resetUserPwd(userId, password);
}
/**
@@ -517,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