refactor(权限管理): 权限设置

backend/src/main/java/io/metersphere/service/OrganizationService.java

@@ -108,10 +108,10 @@ public class OrganizationService {
             workspaceService.deleteWorkspace(workspaceId);
         }
 
-        // delete organization member
-        UserRoleExample userRoleExample = new UserRoleExample();
-        userRoleExample.createCriteria().andSourceIdEqualTo(organizationId);
-        userRoleMapper.deleteByExample(userRoleExample);
+        // delete user group
+        UserGroupExample userGroupExample = new UserGroupExample();
+        userGroupExample.createCriteria().andSourceIdEqualTo(organizationId);
+        userGroupMapper.deleteByExample(userGroupExample);
 
         // delete org
         organizationMapper.deleteByPrimaryKey(organizationId);

backend/src/main/java/io/metersphere/service/WorkspaceService.java

@@ -112,10 +112,10 @@ public class WorkspaceService {
             projectService.deleteProject(projectId);
         });
 
-        // delete workspace member
-        UserRoleExample userRoleExample = new UserRoleExample();
-        userRoleExample.createCriteria().andSourceIdEqualTo(workspaceId);
-        userRoleMapper.deleteByExample(userRoleExample);
+        // delete user group
+        UserGroupExample userGroupExample = new UserGroupExample();
+        userGroupExample.createCriteria().andSourceIdEqualTo(workspaceId);
+        userGroupMapper.deleteByExample(userGroupExample);
 
         // delete workspace
         workspaceMapper.deleteByPrimaryKey(workspaceId);

frontend/src/business/components/settings/organization/OrganizationMember.vue

@@ -27,7 +27,7 @@
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
-        <el-table-column prop="roles" :label="$t('commons.role')" width="140">
+        <el-table-column prop="roles" :label="$t('commons.group')" width="140">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.groups"/>
           </template>
@@ -73,7 +73,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item :label="$t('commons.role')" prop="groupIds">
+        <el-form-item :label="$t('commons.group')" prop="groupIds">
           <el-select v-model="form.groupIds" multiple :placeholder="$t('role.please_choose_role')" class="select-width">
             <el-option
               v-for="item in form.groups"

frontend/src/business/components/settings/system/Organization.vue

@@ -153,7 +153,7 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item :label="$t('commons.role')" prop="groupIds"
+        <el-form-item :label="$t('commons.group')" prop="groupIds"
                       :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
           <el-select filterable v-model="memberForm.groupIds" multiple :placeholder="$t('role.please_choose_role')"
                      class="select-width">

frontend/src/business/components/settings/system/User.vue

@@ -29,7 +29,7 @@
         <el-table-column prop="id" label="ID"/>
         <el-table-column prop="name" :label="$t('commons.name')" width="200"/>
 
-        <el-table-column :label="$t('commons.role')" width="120">
+        <el-table-column :label="$t('commons.group')" width="120">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.roles"/>
           </template>
@@ -516,7 +516,7 @@ export default {
   activated() {
     this.currentUserId = getCurrentUser().id;
     this.search();
-    this.getAllRole();
+    // this.getAllRole();
   },
   methods: {
     create() {

frontend/src/i18n/en-US.js

@@ -63,6 +63,7 @@ export default {
     email: 'Email',
     phone: 'Phone',
     role: 'Role',
+    group: 'Group',
     personal_info: 'Personal Info',
     status: 'Status',
     show_all: 'Show All',

frontend/src/i18n/zh-CN.js

@@ -64,6 +64,7 @@ export default {
     email: '邮箱',
     phone: '电话',
     role: '角色',
+    group: '用户组',
     personal_info: '个人信息',
     api_keys: 'API Keys',
     quota: '配额管理',

frontend/src/i18n/zh-TW.js

@@ -64,6 +64,7 @@ export default {
     email: '郵箱',
     phone: '電話',
     role: '角色',
+    group: '用戶組',
     personal_info: '個人信息',
     api_keys: 'API Keys',
     quota: '配額管理',