Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-report...

6c

2025-10-31 5e1670170c18cf31b8491e0609bf0178c29227f2

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

@@ -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");