diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/service/TestResourcePoolService.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/service/TestResourcePoolService.java index 2e3df6826d..8777e65e6a 100644 --- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/service/TestResourcePoolService.java +++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/service/TestResourcePoolService.java @@ -335,7 +335,7 @@ public class TestResourcePoolService { pool.getCreateUser(), OperationLogType.UPDATE.name(), OperationLogModule.SYSTEM_TEST_RESOURCE_POOL, - "编辑全局用户组对应的权限配置"); + "更新资源池配置"); dto.setPath("/update"); dto.setMethod(HttpMethodConstants.POST.name()); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java index 1115bd6afb..559974ca92 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java @@ -257,6 +257,7 @@ public class OrganizationService { List sourceIds = new ArrayList<>(projectIdList); sourceIds.add(organizationId); userRoleRelationExample.createCriteria().andUserIdIn(new ArrayList<>(userMap.keySet())).andSourceIdIn(sourceIds); + userRoleRelationExample.setOrderByClause("create_time desc"); List userRoleRelationsByUsers = userRoleRelationMapper.selectByExample(userRoleRelationExample); //根据关系表查询出用户的关联组织和用户组 Map> userIdprojectIdMap = new HashMap<>();