From 50a9337ee8c1fe93e6a49f1bb860936814702472 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 28 Aug 2025 13:51:15 +0800
Subject: [PATCH] 优化代码
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 6 +++---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 9 +++++++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 5 +++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 41abb05..c486d80 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -77,6 +77,15 @@
public int updateUserAvatar(@Param("userId") Long userId, @Param("avatar") String avatar);
/**
+ * 修改用户状态
+ *
+ * @param userId 用户ID
+ * @param status 状态
+ * @return 结果
+ */
+ public int updateUserStatus(@Param("userId") Long userId, @Param("status") String status);
+
+ /**
* 更新用户登录信息（IP和登录时间）
*
* @param user 用户信息
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..4c646af 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
@@ -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++;
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 65ff360..49de1ca 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -198,11 +198,11 @@
</update>
<update id="updateUserStatus" parameterType="SysUser">
- update sys_user set status = #{status} where user_id = #{userId}
+ update sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId}
</update>
<update id="updateUserAvatar" parameterType="SysUser">
- update sys_user set avatar = #{avatar} where user_id = #{userId}
+ update sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId}
</update>
<update id="updateLoginInfo" parameterType="SysUser">
@@ -210,7 +210,7 @@
</update>
<update id="resetUserPwd" parameterType="SysUser">
- update sys_user set pwd_update_date = sysdate(), password = #{password} where user_id = #{userId}
+ update sys_user set pwd_update_date = sysdate(), password = #{password}, update_time = sysdate() where user_id = #{userId}
</update>
<delete id="deleteUserById" parameterType="Long">
--
Gitblit v1.9.3