From 6ca82c4965b6bb761a2ac2ae68410a27ebbe7b87 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 10 Apr 2026 16:36:27 +0800
Subject: [PATCH] 代码生成修改拖拽时显示手指样式
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 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 fb6adb2..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;
@@ -28,6 +28,7 @@
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
/**
@@ -57,6 +58,9 @@
@Autowired
private ISysConfigService configService;
+
+ @Autowired
+ private ISysDeptService deptService;
@Autowired
protected Validator validator;
@@ -165,7 +169,7 @@
* @return 结果
*/
@Override
- public String checkUserNameUnique(SysUser user)
+ public boolean checkUserNameUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
@@ -183,7 +187,7 @@
* @return
*/
@Override
- public String checkPhoneUnique(SysUser user)
+ public boolean checkPhoneUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
@@ -201,7 +205,7 @@
* @return
*/
@Override
- public String checkEmailUnique(SysUser user)
+ public boolean checkEmailUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
@@ -234,7 +238,7 @@
@Override
public void checkUserDataScope(Long userId)
{
- if (!SysUser.isAdmin(SecurityUtils.getUserId()))
+ if (!SecurityUtils.isAdmin())
{
SysUser user = new SysUser();
user.setUserId(userId);
@@ -322,7 +326,7 @@
@Override
public int updateUserStatus(SysUser user)
{
- return userMapper.updateUser(user);
+ return userMapper.updateUserStatus(user.getUserId(), user.getStatus());
}
/**
@@ -332,22 +336,33 @@
* @return 结果
*/
@Override
- public int updateUserProfile(SysUser user)
+ public boolean updateUserProfile(SysUser user)
{
- return userMapper.updateUser(user);
+ return userMapper.updateUser(user) > 0;
}
/**
* 修改用户头像
*
- * @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;
}
/**
@@ -359,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);
}
/**
@@ -489,7 +504,6 @@
int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
- String password = configService.selectConfigByKey("sys.user.initPassword");
for (SysUser user : userList)
{
try
@@ -499,19 +513,24 @@
if (StringUtils.isNull(u))
{
BeanValidators.validateWithException(validator, user);
+ deptService.checkDeptDataScope(user.getDeptId());
+ String password = configService.selectConfigByKey("sys.user.initPassword");
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
- this.insertUser(user);
+ userMapper.insertUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
}
else if (isUpdateSupport)
{
BeanValidators.validateWithException(validator, user);
- checkUserAllowed(user);
- checkUserDataScope(user.getUserId());
+ checkUserAllowed(u);
+ checkUserDataScope(u.getUserId());
+ deptService.checkDeptDataScope(user.getDeptId());
+ user.setUserId(u.getUserId());
+ user.setDeptId(u.getDeptId());
user.setUpdateBy(operName);
- this.updateUser(user);
+ userMapper.updateUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
}
--
Gitblit v1.9.3