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

refactor: 修改资源池日志更新内容组织成员排序

This commit is contained in:
guoyuqi 2023-08-22 14:48:13 +08:00 committed by 刘瑞斌
parent e3b4dae516
commit 1b700915fe
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/framework/sdk/src/main/java/io/metersphere/sdk/service/TestResourcePoolService.java
View File

@ -335,7 +335,7 @@ public class TestResourcePoolService {
pool.getCreateUser(), pool.getCreateUser(),
OperationLogType.UPDATE.name(), OperationLogType.UPDATE.name(),
OperationLogModule.SYSTEM_TEST_RESOURCE_POOL, OperationLogModule.SYSTEM_TEST_RESOURCE_POOL,
"编辑全局用户组对应的权限配置"); "更新资源池配置");
dto.setPath("/update"); dto.setPath("/update");
dto.setMethod(HttpMethodConstants.POST.name()); dto.setMethod(HttpMethodConstants.POST.name());

1
backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java
View File

@ -257,6 +257,7 @@ public class OrganizationService {
List<String> sourceIds = new ArrayList<>(projectIdList); List<String> sourceIds = new ArrayList<>(projectIdList);
sourceIds.add(organizationId); sourceIds.add(organizationId);
userRoleRelationExample.createCriteria().andUserIdIn(new ArrayList<>(userMap.keySet())).andSourceIdIn(sourceIds); userRoleRelationExample.createCriteria().andUserIdIn(new ArrayList<>(userMap.keySet())).andSourceIdIn(sourceIds);
userRoleRelationExample.setOrderByClause("create_time desc");
List<UserRoleRelation> userRoleRelationsByUsers = userRoleRelationMapper.selectByExample(userRoleRelationExample); List<UserRoleRelation> userRoleRelationsByUsers = userRoleRelationMapper.selectByExample(userRoleRelationExample);
//根据关系表查询出用户的关联组织和用户组 //根据关系表查询出用户的关联组织和用户组
Map<String, List<IdNameStructureDTO>> userIdprojectIdMap = new HashMap<>(); Map<String, List<IdNameStructureDTO>> userIdprojectIdMap = new HashMap<>();