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 | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 b0bbc08..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,6 +6,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.*;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,7 +63,7 @@
* 获取用户列表
*/
@ApiOperation("获取用户列表")
- @PreAuthorize("@ss.hasPermi('system:user:list')")
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list")
public TableDataInfo list(SysUser user) {
startPage();
@@ -142,7 +143,7 @@
/**
* 修改用户
*/
-
+ @ApiOperation("修改用户")
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping
@@ -237,4 +238,32 @@
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')")
+ @PutMapping("/changePwd")
+ public Results changePwd(String newPassword) {
+ String userId = SecurityUtils.getUserId();
+ SysUser sysUser = userService.selectUserById(userId);
+ userService.checkUserAllowed(sysUser);
+ userService.checkUserDataScope(userId);
+ sysUser.setPassword(SecurityUtils.encryptPassword(newPassword));
+ sysUser.setUpdateBy(getUsername());
+ int num = userService.resetPwd(sysUser);
+ if(num == 0){
+ return Results.error("修改密码失败！");
+ }else {
+ return Results.succeed("修改密码成功！");
+ }
+ }
+
}
--
Gitblit v1.9.3