diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java index eefe6f178d..afa743f20f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java @@ -47,8 +47,8 @@ public class OrganizationUserRoleService extends BaseUserRoleService { .andScopeIdIn(Arrays.asList(organizationId, UserRoleEnum.GLOBAL.toString())); example.setOrderByClause("create_time asc"); List userRoles = userRoleMapper.selectByExample(example); - userRoles.sort(Comparator.comparing(UserRole::getInternal) - .thenComparing(UserRole::getScopeId).thenComparing(Comparator.comparing(UserRole::getCreateTime).reversed()).reversed()); + userRoles.sort(Comparator.comparing(UserRole::getInternal).thenComparing(UserRole::getScopeId) + .thenComparing(Comparator.comparing(UserRole::getCreateTime).thenComparing(UserRole::getId).reversed()).reversed()); return userRoles; } diff --git a/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue b/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue index 83d5e73bbb..47c7e7020a 100644 --- a/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue +++ b/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue @@ -69,10 +69,7 @@ >{{ element.name }} -
+
@@ -160,10 +157,7 @@ >{{ element.name }}
-
+
@@ -251,10 +245,7 @@ >{{ element.name }}
-
+
@@ -321,6 +312,7 @@ const props = defineProps<{ addPermission: string[]; updatePermission: string[]; + isGlobalDisable: boolean; }>(); const appStore = useAppStore(); diff --git a/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue b/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue index 5f528d9d50..aec7b6f0db 100644 --- a/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue +++ b/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue @@ -6,6 +6,7 @@ ref="ugLeftRef" :add-permission="['ORGANIZATION_USER_ROLE:READ+ADD']" :update-permission="['ORGANIZATION_USER_ROLE:READ+UPDATE']" + :is-global-disable="true" @handle-select="handleSelect" @add-user-success="handleAddMember" /> diff --git a/frontend/src/views/setting/system/usergroup/systemUserGroup.vue b/frontend/src/views/setting/system/usergroup/systemUserGroup.vue index 835afd9e54..db50ca782c 100644 --- a/frontend/src/views/setting/system/usergroup/systemUserGroup.vue +++ b/frontend/src/views/setting/system/usergroup/systemUserGroup.vue @@ -6,6 +6,7 @@ ref="ugLeftRef" :add-permission="['SYSTEM_USER_ROLE:READ+ADD']" :update-permission="['SYSTEM_USER_ROLE:READ+UPDATE']" + :is-global-disable="false" @handle-select="handleSelect" @add-user-success="handleAddMember" />