test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test(系统设置): 补充组织成员查询测试

This commit is contained in:
song-cc-rock 2023-08-25 15:52:21 +08:00 committed by 刘瑞斌
parent 8d94d8547c
commit 8b5c5d1af6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleMapper.xml
View File

@ -15,10 +15,11 @@
<select id="listOrganizationRoleMember" resultType="io.metersphere.system.domain.User"> <select id="listOrganizationRoleMember" resultType="io.metersphere.system.domain.User">
select u.* select u.*
from user_role_relation urr from user_role_relation urr left join user u on urr.user_id = u.id
left join user u on urr.user_id = u.id
where urr.source_id = #{request.organizationId} where urr.source_id = #{request.organizationId}
and urr.role_id = #{request.userRoleId} and urr.role_id = #{request.userRoleId}
and u.name like concat('%', #{request.userKeyWord}, '%') <if test="request.userKeyWord != null and request.userKeyWord != ''">
and u.name like concat('%', #{request.userKeyWord}, '%')
</if>
</select> </select>
</mapper> </mapper>

9
backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationUserRoleControllerTests.java
View File

@ -51,7 +51,6 @@ public class OrganizationUserRoleControllerTests extends BaseTest {
@Resource @Resource
private OrganizationService organizationService; private OrganizationService organizationService;
public static final String ORGANIZATION_ROLE_TYPE = "ORGANIZATION";
public static final String ORGANIZATION_USER_ROLE_LIST = "/user/role/organization/list"; public static final String ORGANIZATION_USER_ROLE_LIST = "/user/role/organization/list";
public static final String ORGANIZATION_USER_ROLE_ADD = "/user/role/organization/add"; public static final String ORGANIZATION_USER_ROLE_ADD = "/user/role/organization/add";
public static final String ORGANIZATION_USER_ROLE_UPDATE = "/user/role/organization/update"; public static final String ORGANIZATION_USER_ROLE_UPDATE = "/user/role/organization/update";
@ -243,7 +242,7 @@ public class OrganizationUserRoleControllerTests extends BaseTest {
OrganizationUserRoleMemberRequest request = new OrganizationUserRoleMemberRequest(); OrganizationUserRoleMemberRequest request = new OrganizationUserRoleMemberRequest();
request.setOrganizationId("default-organization-2"); request.setOrganizationId("default-organization-2");
request.setUserRoleId("default-org-role-id-3"); request.setUserRoleId("default-org-role-id-3");
request.setKeyword("admin"); request.setUserKeyWord("admin");
request.setCurrent(1); request.setCurrent(1);
request.setPageSize(10); request.setPageSize(10);
MvcResult mvcResult = this.responsePost(ORGANIZATION_USER_ROLE_LIST_MEMBER, request); MvcResult mvcResult = this.responsePost(ORGANIZATION_USER_ROLE_LIST_MEMBER, request);
@ -259,12 +258,12 @@ public class OrganizationUserRoleControllerTests extends BaseTest {
Assertions.assertEquals(pageData.getCurrent(), request.getCurrent()); Assertions.assertEquals(pageData.getCurrent(), request.getCurrent());
// 返回的数据量不超过规定要返回的数据量相同 // 返回的数据量不超过规定要返回的数据量相同
Assertions.assertTrue(JSON.parseArray(JSON.toJSONString(pageData.getList())).size() <= request.getPageSize()); Assertions.assertTrue(JSON.parseArray(JSON.toJSONString(pageData.getList())).size() <= request.getPageSize());
// 返回值中取出第一条数据, 并判断是否包含关键字default // 返回值中取出第一条数据, 并判断是否包含关键字
List<User> userList = JSON.parseArray(JSON.toJSONString(pageData.getList()), User.class); List<User> userList = JSON.parseArray(JSON.toJSONString(pageData.getList()), User.class);
if(CollectionUtils.isNotEmpty(userList)) { if(CollectionUtils.isNotEmpty(userList)) {
User user = userList.get(0); User user = userList.get(0);
Assertions.assertTrue(StringUtils.contains(user.getName(), request.getKeyword()) Assertions.assertTrue(StringUtils.contains(user.getName(), request.getUserKeyWord())
|| StringUtils.contains(user.getId(), request.getKeyword())); || StringUtils.contains(user.getId(), request.getUserKeyWord()));
} }
// 权限校验 // 权限校验
request.setOrganizationId(getDefault().getId()); request.setOrganizationId(getDefault().getId());