diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PermissionController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PermissionController.java index 8cc166ce26d..d3f5f7a41db 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PermissionController.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PermissionController.java @@ -323,9 +323,8 @@ public ResponseEntity deleteCreateApplicationRoleFromUser(@PathVariable("u @PreAuthorize(value = "@permissionValidator.isSuperAdmin()") @GetMapping("/system/role/createApplication") - public List getCreateApplicationRoleUsers() { - return rolePermissionService.queryUsersWithRole(SystemRoleManagerService.CREATE_APPLICATION_ROLE_NAME) - .stream().map(UserInfo::getUserId).collect(Collectors.toList()); + public Set getCreateApplicationRoleUsers() { + return rolePermissionService.queryUsersWithRole(SystemRoleManagerService.CREATE_APPLICATION_ROLE_NAME); } @GetMapping("/system/role/createApplication/{userId}") diff --git a/apollo-portal/src/main/resources/static/app/setting.html b/apollo-portal/src/main/resources/static/app/setting.html index 698a9693d18..22827bd5139 100644 --- a/apollo-portal/src/main/resources/static/app/setting.html +++ b/apollo-portal/src/main/resources/static/app/setting.html @@ -75,7 +75,7 @@
{{'App.Setting.Admin' | translate }}
- + +