From ef7e86f43eea6fe617323cd027b3cb52a6f0699d Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Thu, 22 Feb 2024 13:54:50 +0800
Subject: [PATCH] 依据主键查询兴趣点提交
---
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