From 81a8192de7e1d907bdeb0b1eefc7380668ea3c21 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 10 Apr 2023 18:17:12 +0800
Subject: [PATCH] 修复导入用户时无法更新存在用户数据的问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 80 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index 3c75107..440f5a1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -1,6 +1,5 @@
package com.ruoyi.system.controller;
-import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,18 +12,19 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.utils.SecurityUtils;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.PreAuthorize;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
@@ -43,7 +43,10 @@
@Autowired
private ISysUserService userService;
- @PreAuthorize(hasPermi = "system:role:list")
+ @Autowired
+ private ISysDeptService deptService;
+
+ @RequiresPermissions("system:role:list")
@GetMapping("/list")
public TableDataInfo list(SysRole role)
{
@@ -53,9 +56,9 @@
}
@Log(title = "角色管理", businessType = BusinessType.EXPORT)
- @PreAuthorize(hasPermi = "system:role:export")
+ @RequiresPermissions("system:role:export")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysRole role) throws IOException
+ public void export(HttpServletResponse response, SysRole role)
{
List<SysRole> list = roleService.selectRoleList(role);
ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
@@ -65,29 +68,29 @@
/**
* 根据角色编号获取详细信息
*/
- @PreAuthorize(hasPermi = "system:role:query")
+ @RequiresPermissions("system:role:query")
@GetMapping(value = "/{roleId}")
public AjaxResult getInfo(@PathVariable Long roleId)
{
roleService.checkRoleDataScope(roleId);
- return AjaxResult.success(roleService.selectRoleById(roleId));
+ return success(roleService.selectRoleById(roleId));
}
/**
* 新增角色
*/
- @PreAuthorize(hasPermi = "system:role:add")
+ @RequiresPermissions("system:role:add")
@Log(title = "角色管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody SysRole role)
{
- if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+ if (!roleService.checkRoleNameUnique(role))
{
- return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+ return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
}
- else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+ else if (!roleService.checkRoleKeyUnique(role))
{
- return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+ return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setCreateBy(SecurityUtils.getUsername());
return toAjax(roleService.insertRole(role));
@@ -97,19 +100,20 @@
/**
* 修改保存角色
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
- if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+ roleService.checkRoleDataScope(role.getRoleId());
+ if (!roleService.checkRoleNameUnique(role))
{
- return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+ return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
}
- else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+ else if (!roleService.checkRoleKeyUnique(role))
{
- return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+ return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setUpdateBy(SecurityUtils.getUsername());
return toAjax(roleService.updateRole(role));
@@ -118,24 +122,26 @@
/**
* 修改保存数据权限
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
public AjaxResult dataScope(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
return toAjax(roleService.authDataScope(role));
}
/**
* 状态修改
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
role.setUpdateBy(SecurityUtils.getUsername());
return toAjax(roleService.updateRoleStatus(role));
}
@@ -143,7 +149,7 @@
/**
* 删除角色
*/
- @PreAuthorize(hasPermi = "system:role:remove")
+ @RequiresPermissions("system:role:remove")
@Log(title = "角色管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
public AjaxResult remove(@PathVariable Long[] roleIds)
@@ -154,16 +160,16 @@
/**
* 获取角色选择框列表
*/
- @PreAuthorize(hasPermi = "system:role:query")
+ @RequiresPermissions("system:role:query")
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
- return AjaxResult.success(roleService.selectRoleAll());
+ return success(roleService.selectRoleAll());
}
/**
* 查询已分配用户角色列表
*/
- @PreAuthorize(hasPermi = "system:role:list")
+ @RequiresPermissions("system:role:list")
@GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user)
{
@@ -175,7 +181,7 @@
/**
* 查询未分配用户角色列表
*/
- @PreAuthorize(hasPermi = "system:role:list")
+ @RequiresPermissions("system:role:list")
@GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user)
{
@@ -187,7 +193,7 @@
/**
* 取消授权用户
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
@@ -198,7 +204,7 @@
/**
* 批量取消授权用户
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
@@ -209,11 +215,25 @@
/**
* 批量选择用户授权
*/
- @PreAuthorize(hasPermi = "system:role:edit")
+ @RequiresPermissions("system:role:edit")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
{
+ roleService.checkRoleDataScope(roleId);
return toAjax(roleService.insertAuthUsers(roleId, userIds));
}
-}
\ No newline at end of file
+
+ /**
+ * 获取对应角色部门树列表
+ */
+ @RequiresPermissions("system:role:query")
+ @GetMapping(value = "/deptTree/{roleId}")
+ public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
+ {
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+ ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
+ return ajax;
+ }
+}
--
Gitblit v1.9.3