From 1fe9f918a907193e84e16de1c4c2d51c2f25c5ec Mon Sep 17 00:00:00 2001 From: liusuyi <1951119284@qq.com> Date: 星期四, 11 七月 2024 22:45:52 +0800 Subject: [PATCH] 测试页兼容流媒体1.8.4 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 8bee62c..d81d647 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -6,7 +6,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import com.ruoyi.common.core.domain.param.ChangePwdParam; import com.ruoyi.utils.result.Results; import io.swagger.annotations.*; import org.apache.commons.lang3.ArrayUtils; @@ -64,7 +63,7 @@ * 鑾峰彇鐢ㄦ埛鍒楄〃 */ @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃") - @PreAuthorize("@ss.hasPermi('system:user:list')") +// @PreAuthorize("@ss.hasPermi('system:user:list')") @GetMapping("/list") public TableDataInfo list(SysUser user) { startPage(); @@ -239,18 +238,25 @@ public AjaxResult deptTree(SysDept dept) { return success(deptService.selectDeptTreeList(dept)); } - + /** + * 鑾峰彇閮ㄩ棬鏍戝垪琛� + */ + @GetMapping("/deptTree/noPerm") + public AjaxResult deptTreeNoPerm(SysDept dept) { + return success(deptService.selectDeptTreeList(dept)); + } /** * 淇敼瀵嗙爜 */ @ApiOperation("淇敼瀵嗙爜") - @PreAuthorize("@ss.hasPermi('system:user:changePwd')") +// @PreAuthorize("@ss.hasPermi('system:user:changePwd')") @PutMapping("/changePwd") - public Results changePwd(@RequestBody ChangePwdParam changePwdParam) { - SysUser sysUser = userService.selectUserById(changePwdParam.getUserId()); + public Results changePwd(String newPassword) { + String userId = SecurityUtils.getUserId(); + SysUser sysUser = userService.selectUserById(userId); userService.checkUserAllowed(sysUser); - userService.checkUserDataScope(changePwdParam.getUserId()); - sysUser.setPassword(SecurityUtils.encryptPassword(changePwdParam.getNewPassword())); + userService.checkUserDataScope(userId); + sysUser.setPassword(SecurityUtils.encryptPassword(newPassword)); sysUser.setUpdateBy(getUsername()); int num = userService.resetPwd(sysUser); if(num == 0){ @@ -259,4 +265,5 @@ return Results.succeed("淇敼瀵嗙爜鎴愬姛锛�"); } } + } -- Gitblit v1.9.3