fix(项目管理): 项目组织用户组展示问题

--bug=1039754 --user=宋昌昌 【项目管理】项目与权限-用户组-点击成员数-点击添加成员-添加提示无权限 https://www.tapd.cn/55049933/s/1501754

backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectUserRoleController.java

@@ -131,7 +131,6 @@ public class ProjectUserRoleController {
     @Operation(summary = "项目管理-项目与权限-用户组-添加用户组成员")
     @RequiresPermissions(PermissionConstants.PROJECT_GROUP_UPDATE)
     @Log(type = OperationLogType.UPDATE, expression = "#msClass.editMemberLog(#request)", msClass = ProjectUserRoleLogService.class)
-    @CheckProjectOwner(resourceId = "#request.getUserRoleId()", resourceType = "user_role", resourceCol = "scope_id")
     public void addMember(@Validated @RequestBody ProjectUserRoleMemberEditRequest request) {
         projectUserRoleService.addMember(request, SessionUtils.getUserId());
     }
@@ -140,7 +139,6 @@ public class ProjectUserRoleController {
     @Operation(summary = "项目管理-项目与权限-用户组-删除用户组成员")
     @RequiresPermissions(PermissionConstants.PROJECT_GROUP_UPDATE)
     @Log(type = OperationLogType.UPDATE, expression = "#msClass.editMemberLog(#request)", msClass = ProjectUserRoleLogService.class)
-    @CheckProjectOwner(resourceId = "#request.getUserRoleId()", resourceType = "user_role", resourceCol = "scope_id")
     public void removeMember(@Validated @RequestBody ProjectUserRoleMemberEditRequest request) {
         projectUserRoleService.removeMember(request);
     }

backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationUserRoleController.java

@@ -131,7 +131,6 @@ public class OrganizationUserRoleController {
     @Operation(summary = "系统设置-组织-用户组-添加用户组成员")
     @RequiresPermissions(PermissionConstants.ORGANIZATION_USER_ROLE_READ_UPDATE)
     @Log(type = OperationLogType.UPDATE, expression = "#msClass.editMemberLog(#request)", msClass = OrganizationUserRoleLogService.class)
-    @CheckOrgOwner(resourceId = "#request.getUserRoleId()", resourceType = "user_role", resourceCol = "scope_id")
     public void addMember(@Validated @RequestBody OrganizationUserRoleMemberEditRequest request) {
         organizationUserRoleService.addMember(request, SessionUtils.getUserId());
     }
@@ -140,7 +139,6 @@ public class OrganizationUserRoleController {
     @Operation(summary = "系统设置-组织-用户组-删除用户组成员")
     @RequiresPermissions(PermissionConstants.ORGANIZATION_USER_ROLE_READ_UPDATE)
     @Log(type = OperationLogType.UPDATE, expression = "#msClass.editMemberLog(#request)", msClass = OrganizationUserRoleLogService.class)
-    @CheckOrgOwner(resourceId = "#request.getUserRoleId()", resourceType = "user_role", resourceCol = "scope_id")
     public void removeMember(@Validated @RequestBody OrganizationUserRoleMemberEditRequest request) {
         organizationUserRoleService.removeMember(request);
     }

backend/services/system-setting/src/main/java/io/metersphere/system/service/UserPlatformAccountService.java

@@ -49,6 +49,7 @@ public class UserPlatformAccountService {
             PluginWrapper pluginWrapper = pluginLoadService.getPluginWrapper(plugin.getId());
             MsPlugin msPlugin = (MsPlugin) pluginWrapper.getPlugin();
             ((Map) accountInfo).put("pluginName", msPlugin.getName());
+            ((Map) accountInfo).put("pluginLogo", ((AbstractPlatformPlugin) msPlugin).getLogo());
             accountInfoMap.put(plugin.getId(), accountInfo);
         });
         return accountInfoMap;

frontend/src/components/business/ms-personal-drawer/components/tripartite.vue

@@ -13,7 +13,7 @@
     <div v-if="orgOptions.length > 0" class="platform-card-container">
       <div v-for="config of dynamicForm" :key="config.key" class="platform-card">
         <div class="mb-[16px] flex items-center">
-          <a-image :src="`/plugin/image/${config.key}?imagePath=static/${config.key}.jpg`" width="24"></a-image>
+          <a-image :src="`/plugin/image/${config.key}?imagePath=${config.pluginLogo}`" width="24"></a-image>
           <div class="ml-[8px] mr-[4px] font-medium text-[var(--color-text-1)]">{{ config.pluginName }}</div>
           <a-tooltip v-if="config.tooltip" :content="config.tooltip" position="right">
             <icon-exclamation-circle
@@ -148,6 +148,7 @@
         dynamicForm.value[key] = {
           key,
           pluginName: res[key].pluginName,
+          pluginLogo: res[key].pluginLogo,
           status: 0,
           formModel: {},
           formRules: res[key].formItems,
@@ -250,4 +251,4 @@
       color: var(--color-text-4) !important;
     }
   }
-</style>
+</style>

frontend/src/components/business/ms-user-group-comp/createOrUpdateUserGroup.vue

@@ -30,6 +30,12 @@
                 @press-enter="handleBeforeOk"
                 @keyup.esc="handleCancel"
               />
+              <span
+                v-if="!props.id && props.authScope === AuthScopeEnum.SYSTEM"
+                class="mt-[8px] text-[13px] font-medium text-[var(--color-text-4)]"
+              >
+                {{ t('system.userGroup.createUserGroupTip') }}
+              </span>
             </a-form-item>
           </a-form>
         </div>

frontend/src/components/business/ms-user-group-comp/msUserGroupLeft.vue

@@ -164,12 +164,38 @@
               @submit="handleRenameCancel(element, element.id)"
             >
               <div class="flex max-w-[100%] grow flex-row items-center justify-between">
-                <a-tooltip :content="element.name">
+                <a-tooltip
+                  :content="
+                    systemType === AuthScopeEnum.ORGANIZATION
+                      ? element.name +
+                        `(${
+                          element.internal
+                            ? t('common.internal')
+                            : element.scopeId === 'global'
+                            ? t('common.system.custom')
+                            : t('common.custom')
+                        })`
+                      : element.name
+                  "
+                >
                   <div
                     class="list-item-name one-line-text text-[var(--color-text-1)]"
                     :class="{ '!text-[rgb(var(--primary-5))]': element.id === currentId }"
                     >{{ element.name }}</div
                   >
+                  <div
+                    v-if="systemType === AuthScopeEnum.ORGANIZATION"
+                    class="one-line-text ml-1 text-[var(--color-text-4)]"
+                    >{{
+                      `(${
+                        element.internal
+                          ? t('common.internal')
+                          : element.scopeId === 'global'
+                          ? t('common.system.custom')
+                          : t('common.custom')
+                      })`
+                    }}</div
+                  >
                 </a-tooltip>
                 <div
                   v-if="

frontend/src/locale/en-US/common.ts

@@ -59,7 +59,8 @@ export default {
   'common.leave': 'Leave',
   'common.rename': 'Rename',
   'common.noData': 'No data',
-  'common.internal': 'Internal',
+  'common.internal': 'System-Internal',
+  'common.system.custom': 'System-Custom',
   'common.custom': 'Custom',
   'common.preview': 'Preview',
   'common.fullScreen': 'Full screen',

frontend/src/locale/zh-CN/common.ts

@@ -62,6 +62,7 @@ export default {
   'common.rename': '重命名',
   'common.noData': '暂无数据',
   'common.internal': '系统内置',
+  'common.system.custom': '系统自定义',
   'common.custom': '自定义',
   'common.preview': '预览',
   'common.fullScreen': '全屏',

frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue

@@ -17,7 +17,13 @@
       <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.scopeId === 'global' ? t('common.internal') : t('common.custom')})`
+          `(${
+            record.internal
+              ? t('common.internal')
+              : record.scopeId === 'global'
+              ? t('common.system.custom')
+              : t('common.custom')
+          })`
         }}</div>
       </div>
     </template>
@@ -328,4 +334,4 @@
   });
 </script>
 
-<style scoped></style>
+<style scoped></style>

frontend/src/views/setting/system/usergroup/locale/en-US.ts

@@ -12,6 +12,7 @@ export default {
       addUser: 'Add user',
       addMember: 'Add member',
       createUserGroup: 'Create user group',
+      createUserGroupTip: 'This user group will be available system-wide',
       emptyUserGroup:
         'There are currently no custom user groups available. Please click "Create" or "+" above to create a user group',
       rename: 'Rename',

frontend/src/views/setting/system/usergroup/locale/zh-CN.ts

@@ -22,6 +22,7 @@ export default {
       create: '创建',
       cancel: '取消',
       createUserGroup: '创建用户组',
+      createUserGroupTip: '该用户组将在整个系统范围内可用',
       userGroupName: '用户组名称',
       authScope: '权限范围',
       auth: '权限',