From 59b6be83d059757671de9a1653efcb9f5f8a16c8 Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期四, 30 十月 2025 15:55:34 +0800
Subject: [PATCH] 关键字加引号

---
 src/main/java/com/product/server/report/service/ChartPropertyConfigService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 8e7a529..9db6ab9 100644
--- a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
+++ b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
@@ -114,8 +114,10 @@
                 //鍐嶆坊鍔犳暟鎹�
                 if(!BaseUtil.dataTableIsEmpty(attributeDataTable)){
                     for (int j = 0; j < attributeDataTable.getRows(); j++) {
-                       FieldSetEntity fieldSetEntity = attributeDataTable.getFieldSetEntity(j);
+                        FieldSetEntity fieldSetEntity = attributeDataTable.getFieldSetEntity(j);
                         fieldSetEntity.setValue("report_config_uuid", subChartsUuid);
+                        fieldSetEntity.setValue("`grouping`", fieldSetEntity.getString("grouping"));
+                        fieldSetEntity.remove("grouping");
                         String report_type_attr_value = fieldSetEntity.getString("report_type_attr_value");
                         if(!BaseUtil.strIsNull(report_type_attr_value) && report_type_attr_value.contains("{#") && report_type_attr_value.contains("#}")){
                             String field_name = report_type_attr_value.replace("{#", "").replace("#}", "");
@@ -242,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