From 470b596ddce65dcbb8087e78f0a096d8ba1a429e Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 八月 2024 08:17:48 +0800
Subject: [PATCH] 电磁锁新增临时电子围栏提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 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 cc2573e..f1f289c 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();
@@ -234,7 +235,45 @@
*/
@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/deptTree")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
}
+ /**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
+ @GetMapping("/deptTreeNoDataScope")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛ㄦ棤鏁版嵁鏉冮檺")
+ public AjaxResult deptTree1(SysDept dept) {
+ return success(deptService.selectDeptTreeListNoDataScope(dept));
+ }
+ /**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛╪oPerm")
+ @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