|
|
@@ -177,6 +177,10 @@ public class SysUserController extends BaseController
|
|
|
{
|
|
|
return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
|
}
|
|
|
+ if(Validator.isNotEmpty(user.getPassword())){
|
|
|
+ //重置密码
|
|
|
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
|
+ }
|
|
|
user.setUpdateBy(SecurityUtils.getUsername());
|
|
|
return toAjax(userService.updateUser(user));
|
|
|
}
|
|
|
@@ -197,16 +201,17 @@ public class SysUserController extends BaseController
|
|
|
/**
|
|
|
* 重置密码
|
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
|
|
|
+
|
|
|
+ /* @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
|
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
|
- @PutMapping("/resetPwd")
|
|
|
+ @PostMapping("/resetPwd")
|
|
|
public AjaxResult resetPwd(@RequestBody SysUser user)
|
|
|
{
|
|
|
userService.checkUserAllowed(user);
|
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
|
user.setUpdateBy(SecurityUtils.getUsername());
|
|
|
return toAjax(userService.resetPwd(user));
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
/**
|
|
|
* 状态修改
|