From bc1c1dbfa7640856d57d6538056d7e98f43d1dbc Mon Sep 17 00:00:00 2001
From: ylwang <ylwang@makwing.com>
Date: Mon, 21 Nov 2022 16:58:44 +0800
Subject: [PATCH] 此处修改曾导致 nacos修改xss开关时，spring容器未重启，filter仍起效。故增加参数判断，参数刷新后，xss开关正常关闭。 此处修改曾导致 nacos修改xss开关时，spring容器未重启，filter仍起效。故增加参数判断，参数刷新后，xss开关正常关闭。
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 2c33155..4513ebf 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
@@ -74,7 +74,7 @@
public AjaxResult getInfo(@PathVariable Long roleId)
{
roleService.checkRoleDataScope(roleId);
- return AjaxResult.success(roleService.selectRoleById(roleId));
+ return success(roleService.selectRoleById(roleId));
}
/**
@@ -87,11 +87,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(SecurityUtils.getUsername());
return toAjax(roleService.insertRole(role));
@@ -110,11 +110,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(SecurityUtils.getUsername());
return toAjax(roleService.updateRole(role));
@@ -165,7 +165,7 @@
@GetMapping("/optionselect")
public AjaxResult optionselect()
{
- return AjaxResult.success(roleService.selectRoleAll());
+ return success(roleService.selectRoleAll());
}
/**
* 查询已分配用户角色列表
--
Gitblit v1.9.3