diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.xml index 735f9a9699..e34c59ed66 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.xml @@ -16,10 +16,10 @@ \ No newline at end of file diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberRequest.java b/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberRequest.java index 68c0b69d32..90a4ba992f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberRequest.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/request/OrganizationUserRoleMemberRequest.java @@ -20,7 +20,4 @@ public class OrganizationUserRoleMemberRequest extends BasePageRequest { @NotBlank(message = "{organization.id.not_blank}") @Size(min = 1, max = 50, message = "{organization.id.length_range}") private String organizationId; - - @Schema(description = "搜索关键字") - private String userKeyWord; } diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java index 9d35de58c1..58e9a11ce8 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java @@ -242,7 +242,7 @@ public class OrganizationUserRoleControllerTests extends BaseTest { OrganizationUserRoleMemberRequest request = new OrganizationUserRoleMemberRequest(); request.setOrganizationId("default-organization-2"); request.setUserRoleId("default-org-role-id-3"); - request.setUserKeyWord("admin"); + request.setKeyword("admin"); request.setCurrent(1); request.setPageSize(10); MvcResult mvcResult = this.responsePost(ORGANIZATION_USER_ROLE_LIST_MEMBER, request); @@ -262,8 +262,8 @@ public class OrganizationUserRoleControllerTests extends BaseTest { List userList = JSON.parseArray(JSON.toJSONString(pageData.getList()), User.class); if(CollectionUtils.isNotEmpty(userList)) { User user = userList.get(0); - Assertions.assertTrue(StringUtils.contains(user.getName(), request.getUserKeyWord()) - || StringUtils.contains(user.getId(), request.getUserKeyWord())); + Assertions.assertTrue(StringUtils.contains(user.getName(), request.getKeyword()) + || StringUtils.contains(user.getId(), request.getKeyword())); } // 权限校验 request.setOrganizationId(getDefault().getId());