diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index dc36f359..043e51f4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -77,6 +77,15 @@ public interface SysUserMapper */ 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和登录时间) * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 5b160992..5ce9fdaf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -327,7 +327,7 @@ public class SysUserServiceImpl implements ISysUserService @Override public int updateUserStatus(SysUser user) { - return userMapper.updateUser(user); + return userMapper.updateUserStatus(user.getUserId(), user.getStatus()); } /** @@ -377,7 +377,7 @@ public class SysUserServiceImpl implements ISysUserService @Override public int resetPwd(SysUser user) { - return userMapper.updateUser(user); + return userMapper.resetUserPwd(user.getUserId(), user.getPassword()); } /** @@ -531,6 +531,7 @@ public class SysUserServiceImpl implements ISysUserService 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-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 65ff3602..49de1cab 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -198,11 +198,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_user set status = #{status} where user_id = #{userId} + update sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId} - update sys_user set avatar = #{avatar} where user_id = #{userId} + update sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId} @@ -210,7 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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}