From 4d7a208f388e42e7dd83dab0e38eadfa0847de1c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 十二月 2024 19:24:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 3f9784c..067624c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -11,6 +11,7 @@
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.annotation.Logical;
 import com.ruoyi.other.api.domain.TUserSite;
 import com.ruoyi.other.api.feignClient.RoleSiteClient;
 import com.ruoyi.other.api.feignClient.UserSiteClient;
@@ -89,6 +90,7 @@
     /**
      * 获取用户列表
      */
+    @RequiresPermissions(value = {"/systemUserManagement", "/roleManagement/info"}, logical = Logical.OR)
     @GetMapping("/list")
     @ApiOperation(value = "获取系统用户列表", tags = {"管理后台-系统用户管理", "管理后台-角色管理"})
     public AjaxResult list(GetSysUserList getSysUserList) {
@@ -109,6 +111,7 @@
     /**
      * 新增用户
      */
+    @RequiresPermissions(value = {"/systemUserManagement/add"}, logical = Logical.OR)
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ApiOperation(value = "添加系统用户", tags = {"管理后台-系统用户管理"})
@@ -145,6 +148,7 @@
     }
     
     
+    @RequiresPermissions(value = {"/systemUserManagement/add", "/systemUserManagement/update"}, logical = Logical.OR)
     @GetMapping("/verifyUserNameRepeat/{username}")
     @ApiOperation(value = "校验账号是否重复", tags = {"管理后台-系统用户管理"})
     public AjaxResult verifyUserNameRepeat(@PathVariable String username){
@@ -156,6 +160,9 @@
         return success();
     }
     
+
+
+    @RequiresPermissions(value = {"/systemUserManagement/update"}, logical = Logical.OR)
     @GetMapping("/getRoleSiteName/{roleId}")
     @ApiOperation(value = "获取角色对应的站点名称", tags = {"管理后台-系统用户管理"})
     public AjaxResult<List<String>> getRoleSiteName(@PathVariable Integer roleId){
@@ -200,6 +207,7 @@
     /**
      * 修改用户
      */
+    @RequiresPermissions(value = {"/systemUserManagement/update"}, logical = Logical.OR)
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
     @ApiOperation(value = "编辑系统用户", tags = {"管理后台-系统用户管理"})
@@ -264,6 +272,7 @@
     /**
      * 删除用户
      */
+    @RequiresPermissions(value = {"/systemUserManagement/del"}, logical = Logical.OR)
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     @ApiOperation(value = "删除系统用户", tags = {"管理后台-系统用户管理"})
@@ -277,6 +286,7 @@
     
 
 
+    @RequiresPermissions(value = {"/systemUserManagement/forbidden"}, logical = Logical.OR)
     @PostMapping("/shopUserStart")
     @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-系统用户管理"})
     public AjaxResult shopUserStart(@RequestBody ShopUserStart shopUserStart) {
@@ -527,6 +537,7 @@
     /**
      * 重置密码
      */
+    @RequiresPermissions(value = {"/systemUserManagement/reset_passwords"}, logical = Logical.OR)
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     @ApiOperation(value = "重置密码", tags = {"管理后台-系统用户管理"})

--
Gitblit v1.7.1