summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshizhendong <[email protected]>2023-06-15 13:54:35 +0800
committershizhendong <[email protected]>2023-06-15 13:54:35 +0800
commit45df201932d4f531672ff13d5bfcf767b4d2983e (patch)
treeb05e9ae968e790d25edcaf7fd834932e5b74826c
parent9eac28011b3fc5e5e34dbbd19653173baed06f3c (diff)
parentd3958d19bfc089ee6b7d236ae772e716ee2d5d53 (diff)
Merge remote-tracking branch 'origin/dev-3.6' into dev-3.7
-rw-r--r--nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
index 2ff9a370..8130552c 100644
--- a/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/dashboard/service/impl/VisualServiceImpl.java
@@ -153,7 +153,7 @@ public class VisualServiceImpl implements VisualService {
futureList.add(CompletableFuture.supplyAsync(() -> {
JSONObject queryData = null;
if (type == 1) {
- queryData = promApiService.query_range(expression, StrUtil.toString(start), StrUtil.toString(end), step, null, null);
+ queryData = promApiService.query_range(expression, StrUtil.toString(start), StrUtil.toString(end), step, "null", null);
} else if (type == 2) {
queryData = lokiApiService.query_range(expression, StrUtil.toString(start), StrUtil.toString(end), StrUtil.emptyToDefault(limit, "100"), null, null, finalDirection, "1", null);
}