From d4e7c888aab39006cac5a16989b4214b7e4fc9d1 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 30 Dec 2021 16:26:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E8=A1=8C=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=90=8D=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/server/RowPermissionsController.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java b/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java index 189c58b52b..c95f60bfa6 100644 --- a/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java +++ b/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java @@ -27,12 +27,18 @@ public class RowPermissionsController { @PostMapping("save") public void save(@RequestBody DatasetRowPermissions datasetRowPermissions) throws Exception { RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); + + DataSetRowPermissionsDTO request = new DataSetRowPermissionsDTO(); + request.setAuthTargetType(datasetRowPermissions.getAuthTargetType()); + request.setAuthTargetId(datasetRowPermissions.getAuthTargetId()); + request.setDatasetFieldId(datasetRowPermissions.getDatasetFieldId()); + List rowPermissionsDTOS = rowPermissionService.searchRowPermissions(request); if(StringUtils.isEmpty(datasetRowPermissions.getId())){ - DataSetRowPermissionsDTO request = new DataSetRowPermissionsDTO(); - request.setAuthTargetType(datasetRowPermissions.getAuthTargetType()); - request.setAuthTargetId(datasetRowPermissions.getAuthTargetId()); - request.setDatasetFieldId(datasetRowPermissions.getDatasetFieldId()); - if(!CollectionUtils.isEmpty(rowPermissionService.searchRowPermissions(request))){ + if(!CollectionUtils.isEmpty(rowPermissionsDTOS)){ + throw new Exception(Translator.get("i18n_rp_exist")); + } + }else { + if(!CollectionUtils.isEmpty(rowPermissionsDTOS) && rowPermissionsDTOS.size() > 1){ throw new Exception(Translator.get("i18n_rp_exist")); } }