From 5e1670170c18cf31b8491e0609bf0178c29227f2 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期五, 31 十月 2025 09:32:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-report/V2.0.0 into dev
---
src/main/java/com/product/server/report/service/ChartPropertyConfigService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
index c0b492c..e5ac258 100644
--- a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
+++ b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
@@ -244,7 +244,7 @@
jsonObject.put("children", newArray);
String reportConfigUuid = object.getString("report_config_uuid");
String reportTypeAttr = object.getString("report_type_attr");
- DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_CONFIG_ATTRIBUTE, " report_type_attr = ? AND report_config_uuid = ? and grouping != 1 ", new String[]{reportTypeAttr, reportConfigUuid});
+ DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_CONFIG_ATTRIBUTE, " report_type_attr = ? AND report_config_uuid = ? and `grouping` != 1 ", new String[]{reportTypeAttr, reportConfigUuid});
for (int j = 0; j < dataTableEntity.getRows(); j++) {
JSONObject groupNew = JSONObject.parseObject(group.toJSONString());
String key = dataTableEntity.getString(j, "grouping");
--
Gitblit v1.9.2