clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !94 from dazer007/sys-user-controller-resetPwd-changeStatus

This commit is contained in:
dazer007 2021-07-28 11:22:58 +00:00 committed by Gitee
parent f6c5c91eb1 45ae58f39b
commit f8d964290f
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
View File

@ -38,7 +38,7 @@ import com.ruoyi.system.service.ISysUserService;
/**
* 用户信息
*
*
* @author ruoyi
*/
@RestController
@ -122,7 +122,7 @@ public class SysUserController extends BaseController
/**
* 获取用户信息
*
*
* @return 用户信息
*/
@GetMapping("getInfo")
@ -234,9 +234,13 @@ public class SysUserController extends BaseController
public AjaxResult resetPwd(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.resetPwd(user));
//只修改特定的属性 dazer
SysUser newSyuser = new SysUser();
newSyuser.setUserId(user.getUserId());
newSyuser.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
newSyuser.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.resetPwd(newSyuser));
}
/**
@ -248,8 +252,13 @@ public class SysUserController extends BaseController
public AjaxResult changeStatus(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
user.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.updateUserStatus(user));
//只修改特定的属性 dazer
SysUser newSyuser = new SysUser();
newSyuser.setUserId(user.getUserId());
newSyuser.setStatus(user.getStatus());
newSyuser.setUpdateBy(SecurityUtils.getUsername());
return toAjax(userService.updateUserStatus(newSyuser));
}
/**