From 9748e10339f81073e4fefe8516c1a03312a25d05 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 07 十二月 2022 11:41:44 +0800
Subject: [PATCH] 升级druid到最新版本1.2.15
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 76731f0..7aaf805 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -83,7 +83,7 @@
public AjaxResult getInfo(@PathVariable Long roleId)
{
roleService.checkRoleDataScope(roleId);
- return AjaxResult.success(roleService.selectRoleById(roleId));
+ return success(roleService.selectRoleById(roleId));
}
/**
@@ -96,11 +96,11 @@
{
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
{
- return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+ return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
}
else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
{
- return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+ return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setCreateBy(getUsername());
return toAjax(roleService.insertRole(role));
@@ -119,11 +119,11 @@
roleService.checkRoleDataScope(role.getRoleId());
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
{
- return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+ return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
}
else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
{
- return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+ return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
}
role.setUpdateBy(getUsername());
@@ -137,9 +137,9 @@
loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
tokenService.setLoginUser(loginUser);
}
- return AjaxResult.success();
+ return success();
}
- return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+ return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
}
/**
@@ -187,7 +187,7 @@
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
- return AjaxResult.success(roleService.selectRoleAll());
+ return success(roleService.selectRoleAll());
}
/**
@@ -251,7 +251,7 @@
/**
* 获取对应角色部门树列表
*/
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @PreAuthorize("@ss.hasPermi('system:role:query')")
@GetMapping(value = "/deptTree/{roleId}")
public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
{
@@ -260,5 +260,4 @@
ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
return ajax;
}
-
}
--
Gitblit v1.9.2