diff --git a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
index 5e1cb004..b7bb6ebd 100644
--- a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
+++ b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
@@ -101,6 +101,25 @@ public interface UserMapper
      */
     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);
+
+    /**
+     * 重置用户密码
+     * 
+     * @param userId 用户ID
+     * @param password 密码
+     * @param salt 盐
+     * @return 结果
+     */
+    public int resetUserPwd(@Param("userId") Long userId, @Param("password") String password, @Param("salt") String salt);
+
     /**
      * 更新用户登录信息（IP和登录时间）
      * 
diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
index 60dc3b6b..b4a346a9 100644
--- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
@@ -337,8 +337,8 @@ public class UserServiceImpl implements IUserService
     public int resetUserPwd(User user)
     {
         user.randomSalt();
-        user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
-        return updateUserInfo(user);
+        String password = passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt());
+        return userMapper.resetUserPwd(user.getUserId(), password, user.getSalt());
     }
 
     /**
@@ -558,6 +558,7 @@ public class UserServiceImpl implements IUserService
                     checkUserDataScope(u.getUserId());
                     deptService.checkDeptDataScope(user.getDeptId());
                     user.setUserId(u.getUserId());
+                    user.setDeptId(u.getDeptId());
                     user.setUpdateBy(operName);
                     userMapper.updateUser(user);
                     successNum++;
@@ -603,6 +604,6 @@ public class UserServiceImpl implements IUserService
     @Override
     public int changeStatus(User user)
     {
-        return userMapper.updateUser(user);
+        return userMapper.updateUserStatus(user.getUserId(), user.getStatus());
     }
 }
diff --git a/src/main/resources/mybatis/system/UserMapper.xml b/src/main/resources/mybatis/system/UserMapper.xml
index 075bc9b0..3fcf8d31 100644
--- a/src/main/resources/mybatis/system/UserMapper.xml
+++ b/src/main/resources/mybatis/system/UserMapper.xml
@@ -170,6 +170,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user set avatar = #{avatar} where user_id = #{userId}
 	</update>
 	
+	<update id="resetUserPwd" parameterType="User">
+ 		update sys_user SET password = #{password}, salt = #{salt}, update_time = sysdate() where user_id = #{userId}
+	</update>
+	
+	<update id="updateUserStatus" parameterType="User">
+ 		update sys_user SET status = #{status}, update_time = sysdate() where user_id = #{userId}
+	</update>
+	
 	<update id="updateLoginInfo" parameterType="User">
  		update sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId}
 	</update>