From 313613722ed2ff8112da1d25ce62b961d565760b Mon Sep 17 00:00:00 2001 From: Jianguo-Genius Date: Mon, 22 Jul 2024 16:13:05 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=B2=BE=E7=AE=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1043879 --user=宋天阳 【系统设置】系统-用户-邮箱邀请-用户无「用户组」查询权限，也应该正常邀请用户 https://www.tapd.cn/55049933/s/1552104 --- .../java/io/metersphere/system/controller/UserController.java | 2 +- .../system/controller/user/UserControllerPermissionTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java index 9b6cd211ad..ad88ab78d9 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/UserController.java @@ -128,7 +128,7 @@ public class UserController { @GetMapping("/get/global/system/role") @Operation(summary = "系统设置-系统-用户-查找系统级用户组") - @RequiresPermissions(value = {PermissionConstants.SYSTEM_USER_ROLE_READ, PermissionConstants.SYSTEM_USER_INVITE}, logical = Logical.OR) + @RequiresPermissions(PermissionConstants.SYSTEM_USER_READ) public List getGlobalSystemRole() { return globalUserRoleService.getGlobalSystemRoleList(); } diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerPermissionTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerPermissionTests.java index bf4aec44fa..584fb5b14e 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerPermissionTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerPermissionTests.java @@ -96,7 +96,7 @@ public class UserControllerPermissionTests extends BaseTest { //校验权限：系统全局用户组获取 - this.requestGetPermissionTest(PermissionConstants.SYSTEM_USER_ROLE_READ, UserRequestUtils.URL_GET_GLOBAL_SYSTEM); + this.requestGetPermissionTest(PermissionConstants.SYSTEM_USER_READ, UserRequestUtils.URL_GET_GLOBAL_SYSTEM); // 查看组织 this.requestGetPermissionsTest(List.of(PermissionConstants.SYSTEM_USER_ROLE_READ, PermissionConstants.SYSTEM_ORGANIZATION_PROJECT_READ), UserRequestUtils.URL_GET_ORGANIZATION); //查看项目