From b858894ed68b99362692bc2384b1887513f3edf6 Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Thu, 17 Aug 2023 16:50:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E7=BB=84=E7=BB=87=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sdk/src/main/resources/i18n/system_en_US.properties | 3 ++- .../sdk/src/main/resources/i18n/system_zh_CN.properties | 1 + .../sdk/src/main/resources/i18n/system_zh_TW.properties | 1 + .../main/java/io/metersphere/system/dto/OrganizationDTO.java | 2 +- .../io/metersphere/system/mapper/ExtOrganizationMapper.xml | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/framework/sdk/src/main/resources/i18n/system_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/system_en_US.properties index 119978b66f..01e60975b6 100644 --- a/backend/framework/sdk/src/main/resources/i18n/system_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/system_en_US.properties @@ -149,7 +149,8 @@ organization_user_role_permission_error=no organization user role permission user_role_exist=User role already exists user_role_not_exist=User role not exist user_role_not_edit=User role can not edit -at_least_one_user_role_require=at least one user role require +at_least_one_user_role_require=At least one user role require +default_organization_not_allow_delete=Default organization not allow delete # plugin plugin.id.not_blank=id cannot be empty plugin.id.length_range=id length must be between {min} and {max} diff --git a/backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties index 4453f4406a..a08fe3ee6a 100644 --- a/backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/system_zh_CN.properties @@ -149,6 +149,7 @@ user_role_exist=用户组已存在 user_role_not_exist=用户组不存在 user_role_not_edit=用户组无法编辑 at_least_one_user_role_require=至少需要一个用户组 +default_organization_not_allow_delete=默认组织无法删除 # plugin plugin.id.not_blank=ID不能为空 plugin.id.length_range=ID长度必须在{min}和{max}之间 diff --git a/backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties index b688ca669e..7c9d410112 100644 --- a/backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/system_zh_TW.properties @@ -149,6 +149,7 @@ user_role_exist=用戶組已存在 user_role_not_exist=用戶組不存在 user_role_not_edit=用戶組無法編輯 at_least_one_user_role_require=至少需要一個用戶組 +default_organization_not_allow_delete=默認組織無法刪除 # plugin plugin.id.not_blank=ID不能為空 plugin.id.length_range=ID長度必須在{min}和{max}之间 diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/OrganizationDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/OrganizationDTO.java index 616b4a56b9..623801fe6e 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/OrganizationDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/OrganizationDTO.java @@ -48,5 +48,5 @@ public class OrganizationDTO extends Organization { * 创建人是否是管理员 */ @Schema(description = "创建人是否是管理员") - private boolean orgCreateUserIsAdmin; + private Boolean orgCreateUserIsAdmin; } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml index 47eea4af03..7d01409f81 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml @@ -28,7 +28,7 @@