From 8a080ddeb7946e06559f5aec557b88d831c99767 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 1 Aug 2022 18:02:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=88=97?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/PermissionService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java index 8498a80674..cc4478273c 100644 --- a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java +++ b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java @@ -175,7 +175,6 @@ public class PermissionService { dataSetColumnPermissionsDTO.setAuthTargetIds(Collections.singletonList(userId)); dataSetColumnPermissionsDTO.setAuthTargetType("user"); datasetColumnPermissions.addAll(columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)); - if(CollectionUtils.isNotEmpty(roleIds)){ dataSetColumnPermissionsDTO.setAuthTargetIds(roleIds); dataSetColumnPermissionsDTO.setAuthTargetType("role"); @@ -183,7 +182,7 @@ public class PermissionService { for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { columnPermissionsDTO.getWhiteListUser(); List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() {}.getType()); - if(CollectionUtils.isNotEmpty(userIdList) && !userIdList.contains(userId)){ + if(CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)){ roleColumnPermissionsDTOS.add(columnPermissionsDTO); } } @@ -196,7 +195,7 @@ public class PermissionService { List deptColumnPermissionsDTOS = new ArrayList<>(); for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) { List userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken>() {}.getType()); - if(CollectionUtils.isNotEmpty(userIdList) && !userIdList.contains(userId)){ + if(CollectionUtils.isEmpty(userIdList) || !userIdList.contains(userId)){ deptColumnPermissionsDTOS.add(columnPermissionsDTO); } }