From bb849a2a55fc35b39d4da9525e173d8ecc337b49 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 28 Jul 2023 14:27:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=8C=E5=88=97=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/PermissionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 35700b8fd8..7d9a13c001 100644 --- a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java +++ b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java @@ -239,7 +239,7 @@ public class PermissionService { request.setDatasetId(datasetId); request.setAuthTargetType("dept"); List items = (List)columnPermissionService.authObjs(request); - if(CollectionUtils.isNotEmpty(items) && items.stream().map(Item::getId).collect(Collectors.toList()).contains(deptId)){ + if(CollectionUtils.isNotEmpty(items) && items.stream().filter(item -> item != null).map(Item::getId).collect(Collectors.toList()).contains(deptId)){ dataSetColumnPermissionsDTO.setAuthTargetIds(Collections.singletonList(deptId)); dataSetColumnPermissionsDTO.setAuthTargetType("dept"); List deptColumnPermissionsDTOS = new ArrayList<>();