From 61c0c76a34c02128521e870215e5e41f640c3257 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 4 Sep 2024 11:41:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/ExportCenterManage.java | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index 250c210ea1..c66a8e0d0e 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -395,7 +395,7 @@ public class ExportCenterManage { } if (StringUtils.isNotEmpty(request.getExpressionTree())) { Gson gson = new Gson(); - DatasetRowPermissionsTreeObj datasetRowPermissionsTreeObj = gson.fromJson(request.getExpressionTree(), DatasetRowPermissionsTreeObj.class); + DatasetRowPermissionsTreeObj datasetRowPermissionsTreeObj =JsonUtil.parseObject(request.getExpressionTree(), DatasetRowPermissionsTreeObj.class); permissionManage.getField(datasetRowPermissionsTreeObj); DataSetRowPermissionsTreeDTO dataSetRowPermissionsTreeDTO = new DataSetRowPermissionsTreeDTO(); dataSetRowPermissionsTreeDTO.setTree(datasetRowPermissionsTreeObj); @@ -468,15 +468,7 @@ public class ExportCenterManage { cell.setCellStyle(cellStyle); detailsSheet.setColumnWidth(j, 255 * 20); } else { - if ((allFields.get(j).getDeType().equals(DeTypeConstants.DE_INT) || allFields.get(j).getDeType() == DeTypeConstants.DE_FLOAT) && StringUtils.isNotEmpty(rowData.get(j))) { - try { - cell.setCellValue(Double.valueOf(rowData.get(j))); - } catch (Exception e) { - LogUtil.warn("export excel data transform error"); - } - } else { - cell.setCellValue(rowData.get(j)); - } + cell.setCellValue(rowData.get(j)); } } } @@ -499,15 +491,7 @@ public class ExportCenterManage { if (rowData != null) { for (int j = 0; j < rowData.size(); j++) { Cell cell = row.createCell(j); - if ((allFields.get(j).getDeType().equals(DeTypeConstants.DE_INT) || allFields.get(j).getDeType() == DeTypeConstants.DE_FLOAT) && StringUtils.isNotEmpty(rowData.get(j))) { - try { - cell.setCellValue(Double.valueOf(rowData.get(j))); - } catch (Exception e) { - LogUtil.warn("export excel data transform error"); - } - } else { - cell.setCellValue(rowData.get(j)); - } + cell.setCellValue(rowData.get(j)); } } } From 5ee18f4d019b61472c11dcb9e65e12cbff985bbd Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 4 Sep 2024 11:41:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20sql=20=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/commons/utils/SqlparserUtils.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java index 877d535d92..74654e4784 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java +++ b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java @@ -177,8 +177,11 @@ public class SqlparserUtils { } } - private static String handleHaving(PlainSelect plainSelect) throws Exception { + private static void handleHaving(PlainSelect plainSelect) throws Exception { Expression expr = plainSelect.getHaving(); + if (expr == null) { + return; + } StringBuilder stringBuilder = new StringBuilder(); BinaryExpression binaryExpression = null; try { @@ -192,12 +195,10 @@ public class SqlparserUtils { } else { expr.accept(getExpressionDeParser(stringBuilder)); } - } else { expr.accept(getExpressionDeParser(stringBuilder)); } plainSelect.setHaving(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString())); - return plainSelect.toString(); } private static String handleWhere(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception {