From 57b8b87f38b984e80c47af45775f98006b6001e2 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 26 Jul 2022 12:39:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E8=A1=8C=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/server/RowPermissionsTreeController.java | 12 ++++++++++++ .../main/resources/i18n/messages_en_US.properties | 5 ++++- .../main/resources/i18n/messages_zh_CN.properties | 3 +++ .../main/resources/i18n/messages_zh_TW.properties | 5 ++++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java b/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java index 251d3563a8..b2801efb44 100644 --- a/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java +++ b/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java @@ -5,14 +5,18 @@ import com.github.pagehelper.PageHelper; import io.dataease.auth.annotation.DePermission; import io.dataease.commons.constants.DePermissionType; import io.dataease.commons.constants.ResourceAuthLevel; +import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; +import io.dataease.i18n.Translator; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeRequest; import io.dataease.plugins.config.SpringContextUtil; import io.dataease.plugins.xpack.auth.service.RowPermissionTreeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -27,6 +31,14 @@ public class RowPermissionsTreeController { @ApiOperation("保存") @PostMapping("save") public void save(@RequestBody DataSetRowPermissionsTreeDTO request) { + if (StringUtils.isEmpty(request.getAuthTargetType())) { + DEException.throwException(Translator.get("i18n_row_permission_type_error")); + } + if (!StringUtils.equalsIgnoreCase(request.getAuthTargetType(), "sysParams")) { + if (ObjectUtils.isEmpty(request.getAuthTargetId())) { + DEException.throwException(Translator.get("i18n_row_permission_id")); + } + } RowPermissionTreeService rowPermissionTreeService = SpringContextUtil.getBean(RowPermissionTreeService.class); rowPermissionTreeService.save(request); } diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 50c40edd76..5cbebaefa7 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -194,4 +194,7 @@ I18N_SQL_variable_limit=SQL variables can only be used in where conditions I18N_EMAIL_CONFIG_ERROR=Email config error I18N_EMAIL_HOST_ERROR=Email host can not be empty I18N_EMAIL_PORT_ERROR=Email port can not be empty -I18N_EMAIL_ACCOUNT_ERROR=Email account can not be empty \ No newline at end of file +I18N_EMAIL_ACCOUNT_ERROR=Email account can not be empty + +i18n_row_permission_type_error=Row permission type can not be empty +i18n_row_permission_id=Row permission type is Dept/Role/User,name can not be empty diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 85ec0db965..8536470fe4 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -197,3 +197,6 @@ I18N_EMAIL_CONFIG_ERROR=邮件配置错误 I18N_EMAIL_HOST_ERROR=邮件主机不能为空 I18N_EMAIL_PORT_ERROR=邮件端口不能为空 I18N_EMAIL_ACCOUNT_ERROR=邮件账号不能为空 + +i18n_row_permission_type_error=行权限类型不能为空 +i18n_row_permission_id=行权限类型为组织/角色/用户时，名称不能为空 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 4c0bde8941..e106f3edbc 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -192,4 +192,7 @@ I18N_SQL_variable_limit=SQL變數只能在WHERE條件中使用 I18N_EMAIL_CONFIG_ERROR=郵件配置錯誤 I18N_EMAIL_HOST_ERROR=郵件主機不能為空 I18N_EMAIL_PORT_ERROR=郵件端口不能為空 -I18N_EMAIL_ACCOUNT_ERROR=郵件賬號不能為空 \ No newline at end of file +I18N_EMAIL_ACCOUNT_ERROR=郵件賬號不能為空 + +i18n_row_permission_type_error=行權限類型不能為空 +i18n_row_permission_id=行權限類型為組織/角色/用戶時，名稱不能為空