Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5683f2dccc
@ -95,7 +95,7 @@ public class SysRoleController extends BaseController
|
||||
}
|
||||
else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
|
||||
{
|
||||
return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败,角色权限已存在");
|
||||
return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败,角色编码已存在");
|
||||
}
|
||||
role.setCreateBy(getUsername());
|
||||
return toAjax(roleService.insertRole(role));
|
||||
@ -118,7 +118,7 @@ public class SysRoleController extends BaseController
|
||||
}
|
||||
else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
|
||||
{
|
||||
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败,角色权限已存在");
|
||||
return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败,角色编码已存在");
|
||||
}
|
||||
role.setUpdateBy(getUsername());
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user