|
@@ -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++;
|