From 3eeab0eac0805fbc374ca66180e98acda2a9dd76 Mon Sep 17 00:00:00 2001
From: Thomasr <techninjas514@thecoderagency.com>
Date: Fri, 4 Apr 2025 11:07:28 -0400
Subject: [PATCH] Fix null pointer exception of query execution

---
 .../domain/query/service/QueryExecutionServiceImpl.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java
index db303a0cf..9c318a379 100644
--- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java
+++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/service/QueryExecutionServiceImpl.java
@@ -20,6 +20,7 @@
 import reactor.core.publisher.Mono;
 
 import java.time.Duration;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
@@ -81,7 +82,12 @@ private Mono<QueryExecutionResult> executeLocally(Datasource datasource, Map<Str
     private Mono<QueryExecutionResult> executeByNodeJs(Datasource datasource, Map<String, Object> queryConfig, Map<String, Object> requestParams, QueryVisitorContext queryVisitorContext) {
         List<Map<String, Object>> context = requestParams.entrySet()
                 .stream()
-                .map(entry -> Map.of("key", entry.getKey(), "value", entry.getValue()))
+                .map(entry -> {
+                    Map<String, Object> temp = new HashMap<>();
+                    temp.put("key", entry.getKey());
+                    temp.put("value", entry.getValue()); // Allows null values
+                    return temp;
+                })
                 .collect(Collectors.toList());
 
         //forward cookies to js datasource