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); } }