From 0eadf44495cb3e1dd51b54bc6075b2db5f8a2d7a Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Wed, 24 Jul 2024 16:47:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/BaseUserRolePermissionService.java | 8 ++++---- .../projectAndPermission/menuManagement/locale/en-US.ts | 2 +- .../projectAndPermission/menuManagement/locale/zh-CN.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserRolePermissionService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserRolePermissionService.java index 7e08d00b06..83d6fa0bda 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserRolePermissionService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserRolePermissionService.java @@ -1,16 +1,16 @@ package io.metersphere.system.service; -import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest; import io.metersphere.system.domain.UserRolePermission; import io.metersphere.system.domain.UserRolePermissionExample; +import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest; import io.metersphere.system.mapper.UserRolePermissionMapper; +import io.metersphere.system.uid.IDGenerator; import jakarta.annotation.Resource; import org.apache.commons.lang3.BooleanUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Set; -import io.metersphere.system.uid.IDGenerator; import java.util.stream.Collectors; /** @@ -56,10 +56,10 @@ public class BaseUserRolePermissionService { public void updatePermissionSetting(PermissionSettingUpdateRequest request) { List permissions = request.getPermissions(); - // 先删除 + // 先删除 (排除内置基本信息用户组) UserRolePermissionExample userGroupPermissionExample = new UserRolePermissionExample(); userGroupPermissionExample.createCriteria() - .andRoleIdEqualTo(request.getUserRoleId()); + .andRoleIdEqualTo(request.getUserRoleId()).andPermissionIdNotEqualTo("PROJECT_BASE_INFO:READ"); userRolePermissionMapper.deleteByExample(userGroupPermissionExample); // 再新增 diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts index ae32f6eb43..0d60e877a0 100644 --- a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts +++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/en-US.ts @@ -38,7 +38,7 @@ export default { 'project.menu.SYNC_ENABLE': 'Status', 'project.menu.MECHANISM': 'Interface Test Update Synchronization Rule', 'project.menu.row1': 'The system displays data that meets the rules in My To-Do List - To Be Updated', - 'project.menu.row2': 'Synchronize defects created on the platform to third-party project management platforms', + 'project.menu.row2': 'Bidirectional synchronization with defects of third-party project management platforms', 'project.menu.row3': 'Add test cases to the public test case library for sharing', 'project.menu.row4': 'Associate test cases with third-party project management platforms', 'project.menu.row5': diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts index e26eedd39a..c3d489ef2d 100644 --- a/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts +++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/locale/zh-CN.ts @@ -35,7 +35,7 @@ export default { 'project.menu.SYNC_ENABLE': '状态', 'project.menu.MECHANISM': '接口测试待更新同步规则', 'project.menu.row1': '系统根据设定的规则将符合的数据展示在我的待办-待更新列表', - 'project.menu.row2': '将平台创建的缺陷同步至第三方项目管理平台', + 'project.menu.row2': '与第三方项目管理平台的缺陷进行双向同步', 'project.menu.row3': '可将用例添加至公共用例库共用', 'project.menu.row4': '可将用例与第三方项目管理平台进行关联', 'project.menu.row5': '评审活动中用例发生变更，用例状态自动切换为重新提审',