center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11991 from dataease/pr@dev2@fixds

Browse Source 
Pr@dev2@fixds
This commit is contained in:
taojinlong 2024-09-04 11:42:10 +08:00 committed by GitHub
commit b6c1c7ca75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
View File

@ -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 {

22
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
View File

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