diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java index 572f7ccdd..69c5c3f8f 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryApiServiceImpl.java @@ -87,7 +87,10 @@ private Flux getByOrgIdWithDatasourcePermissions(String orgId) { Flux libraryQueryFlux = libraryQueryService.getByOrganizationId(orgId) .cache(); - Mono> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> libraryQuery.getQuery().getDatasourceId()) + Mono> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> { + var datasourceId = libraryQuery.getQuery().getDatasourceId(); + return Objects.requireNonNullElse(datasourceId, ""); + }) .filter(StringUtils::isNotBlank) .collectList() .cache();