From b99d7a60faf44baf5fb56584d59757c38d162c83 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Sun, 17 Mar 2024 01:41:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=84=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1037240 --user=宋昌昌 【项目管理】项目与权限-用户组-管理员账号来修改权限，报错没有权限操作全局用户组 https://www.tapd.cn/55049933/s/1476736
---
 .../project/mapper/ExtProjectUserRoleMapper.xml   |  2 +-
 .../project/service/ProjectUserRoleService.java   |  2 --
 .../service/OrganizationUserRoleService.java      |  3 ++-
 .../business/ms-user-group-comp/authTable.vue     |  6 +++---
 .../ms-user-group-comp/msUserGroupLeft.vue        | 15 ++++++++++++---
 .../src/components/pure/ms-table/base-table.vue   |  3 +--
 frontend/src/locale/zh-CN/common.ts               |  2 +-
 .../userGroup/projectUserGroup.vue                | 10 +++++-----
 .../organization/usergroup/orgUserGroup.vue       |  4 +++-
 9 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml
index 4963cf31be..a8934c8c82 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectUserRoleMapper.xml
@@ -10,7 +10,7 @@
             ur.name like concat('%', #{request.keyword}, '%')
             )
         </if>
-        order by ur.create_time
+        order by ur.internal desc, ur.scope_id desc, ur.create_time
     </select>
 
     <select id="getRelationByRoleIds" resultType="io.metersphere.system.domain.UserRoleRelation">
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectUserRoleService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectUserRoleService.java
index b64ad40b49..f98fa0add8 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectUserRoleService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectUserRoleService.java
@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -74,7 +73,6 @@ public class ProjectUserRoleService extends BaseUserRoleService {
                 role.setMemberCount(0);
             });
         }
-        roles.sort(Comparator.comparing(UserRole::getInternal).reversed());
         return roles;
     }
 
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 b939a63840..eefe6f178d 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,7 +47,8 @@ public class OrganizationUserRoleService extends BaseUserRoleService {
                 .andScopeIdIn(Arrays.asList(organizationId, UserRoleEnum.GLOBAL.toString()));
         example.setOrderByClause("create_time asc");
         List<UserRole> userRoles = userRoleMapper.selectByExample(example);
-        userRoles.sort(Comparator.comparing(UserRole::getInternal).reversed());
+        userRoles.sort(Comparator.comparing(UserRole::getInternal)
+                .thenComparing(UserRole::getScopeId).thenComparing(Comparator.comparing(UserRole::getCreateTime).reversed()).reversed());
         return userRoles;
     }
 
diff --git a/frontend/src/components/business/ms-user-group-comp/authTable.vue b/frontend/src/components/business/ms-user-group-comp/authTable.vue
index 0eab90918c..ad513ab043 100644
--- a/frontend/src/components/business/ms-user-group-comp/authTable.vue
+++ b/frontend/src/components/business/ms-user-group-comp/authTable.vue
@@ -20,7 +20,7 @@
                 v-if="tableData && tableData?.length > 0"
                 :model-value="allChecked"
                 :indeterminate="allIndeterminate"
-                :disabled="systemAdminDisabled"
+                :disabled="systemAdminDisabled || disabled"
                 class="mr-[7px]"
                 @change="handleAllAuthChangeByCheckbox"
               ></a-checkbox>
@@ -35,7 +35,7 @@
                 <a-checkbox
                   v-for="item in record.permissions"
                   :key="item.id"
-                  :disabled="item.license || systemAdminDisabled"
+                  :disabled="item.license || systemAdminDisabled || disabled"
                   :value="item.id"
                   >{{ t(item.name) }}</a-checkbox
                 >
@@ -44,7 +44,7 @@
                 class="mr-[7px]"
                 :model-value="record.enable"
                 :indeterminate="record.indeterminate"
-                :disabled="systemAdminDisabled"
+                :disabled="systemAdminDisabled || disabled"
                 @change="(value) => handleRowAuthChange(value, rowIndex)"
               />
             </div>
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 62eea2b9e2..83d5e73bbb 100644
--- a/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue
+++ b/frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue
@@ -69,7 +69,10 @@
                     >{{ element.name }}</div
                   >
                 </a-tooltip>
-                <div v-if="element.id === currentId && !element.internal" class="flex flex-row items-center gap-[8px]">
+                <div
+                  v-if="element.id === currentId && element.scopeId !== 'global'"
+                  class="flex flex-row items-center gap-[8px]"
+                >
                   <MsMoreAction
                     v-if="element.type === systemType"
                     v-permission="props.updatePermission"
@@ -157,7 +160,10 @@
                     >{{ element.name }}</div
                   >
                 </a-tooltip>
-                <div v-if="element.id === currentId && !element.internal" class="flex flex-row items-center gap-[8px]">
+                <div
+                  v-if="element.id === currentId && element.scopeId !== 'global'"
+                  class="flex flex-row items-center gap-[8px]"
+                >
                   <MsMoreAction
                     v-if="element.type === systemType"
                     v-permission="props.updatePermission"
@@ -245,7 +251,10 @@
                     >{{ element.name }}</div
                   >
                 </a-tooltip>
-                <div v-if="element.id === currentId && !element.internal" class="flex flex-row items-center gap-[8px]">
+                <div
+                  v-if="element.id === currentId && element.scopeId !== 'global'"
+                  class="flex flex-row items-center gap-[8px]"
+                >
                   <MsMoreAction
                     v-if="element.type === systemType"
                     v-permission="props.updatePermission"
diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue
index fdef6005ad..ce8105dbba 100644
--- a/frontend/src/components/pure/ms-table/base-table.vue
+++ b/frontend/src/components/pure/ms-table/base-table.vue
@@ -162,7 +162,7 @@
                       item.editType &&
                       editActiveKey !== `${item.dataIndex}${rowIndex}` &&
                       !record.deleted &&
-                      !record.internal
+                      record.scopeId !== 'global'
                     "
                     class="ml-2 cursor-pointer"
                     :class="{ 'ms-table-edit-active': editActiveKey === rowIndex }"
@@ -264,7 +264,6 @@
 
   import { useI18n } from '@/hooks/useI18n';
   import { useAppStore, useTableStore } from '@/store';
-  import { characterLimit } from '@/utils';
 
   import { DragSortParams } from '@/models/common';
   import { ColumnEditTypeEnum, SelectAllEnum, SpecialColumnEnum } from '@/enums/tableEnum';
diff --git a/frontend/src/locale/zh-CN/common.ts b/frontend/src/locale/zh-CN/common.ts
index 63099a1877..24a87d4bc2 100644
--- a/frontend/src/locale/zh-CN/common.ts
+++ b/frontend/src/locale/zh-CN/common.ts
@@ -61,7 +61,7 @@ export default {
   'common.leave': '离开',
   'common.rename': '重命名',
   'common.noData': '暂无数据',
-  'common.internal': '内部',
+  'common.internal': '系统内置',
   'common.custom': '自定义',
   'common.preview': '预览',
   'common.fullScreen': '全屏',
diff --git a/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue b/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue
index 016ef64744..6e87f1a8ea 100644
--- a/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue
+++ b/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue
@@ -17,7 +17,7 @@
       <div class="flex flex-row items-center gap-[4px]">
         <div class="one-line-text">{{ record.name }}</div>
         <div class="ml-1 text-[var(--color-text-4)]">{{
-          `(${record.internal ? t('common.internal') : t('common.custom')})`
+          `(${record.scopeId === 'global' ? t('common.internal') : t('common.custom')})`
         }}</div>
       </div>
     </template>
@@ -34,10 +34,10 @@
       <div class="flex flex-row flex-nowrap">
         <span v-permission="['PROJECT_GROUP:READ']" class="flex flex-row">
           <MsButton class="!mr-0" @click="showAuthDrawer(record)">{{ t('project.userGroup.viewAuth') }}</MsButton>
-          <a-divider v-if="!record.internal" direction="vertical" />
+          <a-divider v-if="record.scopeId !== 'global'" direction="vertical" />
         </span>
         <MsButton
-          v-if="!record.internal"
+          v-if="record.scopeId !== 'global'"
           v-permission="['PROJECT_GROUP:READ+UPDATE']"
           class="!mr-0"
           status="danger"
@@ -51,7 +51,7 @@
     :width="928"
     :visible="authVisible"
     unmount-on-close
-    :footer="!currentItem.internal"
+    :footer="currentItem.scopeId !== 'global'"
     :title="currentItem.name"
     :mask="false"
     @cancel="authVisible = false"
@@ -61,7 +61,7 @@
       :show-bottom="false"
       :scroll="{ x: 800, y: 'calc(100vh - 150px)' }"
       :current="currentItem"
-      :disabled="!hasAnyPermission(['PROJECT_GROUP:READ+UPDATE'])"
+      :disabled="!hasAnyPermission(['PROJECT_GROUP:READ+UPDATE']) || currentItem.scopeId === 'global'"
     />
     <template #footer>
       <div class="flex items-center justify-between">
diff --git a/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue b/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
index 832ca17adf..5f528d9d50 100644
--- a/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
+++ b/frontend/src/views/setting/organization/usergroup/orgUserGroup.vue
@@ -51,7 +51,9 @@
               :current="currentUserGroupItem"
               :width="bottomWidth"
               :save-permission="['ORGANIZATION_USER_ROLE:READ+UPDATE']"
-              :disabled="!hasAnyPermission(['ORGANIZATION_USER_ROLE:READ+UPDATE'])"
+              :disabled="
+                !hasAnyPermission(['ORGANIZATION_USER_ROLE:READ+UPDATE']) || currentUserGroupItem.scopeId === 'global'
+              "
             />
           </div>
         </div>