Merge pull request #1357 from lowcoder-org/fix/querylibrary

FalkWolsky · web-flow · commit e3febbd45d88 · 2024-11-29T12:24:01.000+01:00
Fixed null pointer exception when there is streamApi query library ty…
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
@@ -87,7 +87,10 @@ private Flux<LibraryQuery> getByOrgIdWithDatasourcePermissions(String orgId) {
         Flux<LibraryQuery> libraryQueryFlux = libraryQueryService.getByOrganizationId(orgId)
                 .cache();
 
-        Mono<List<String>> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> libraryQuery.getQuery().getDatasourceId())
+        Mono<List<String>> datasourceIdListMono = libraryQueryFlux.map(libraryQuery -> {
+                    var datasourceId = libraryQuery.getQuery().getDatasourceId();
+                    return Objects.requireNonNullElse(datasourceId, "");
+                })
                 .filter(StringUtils::isNotBlank)
                 .collectList()
                 .cache();
