public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(图表): 修复明细表合并单元格后，维度列存在空值时导出失败 #16777

Browse Source
This commit is contained in:
wisonic
2025-08-29 16:57:18 +08:00
committed by wisonic-s
parent 2cc6f2435d
commit efd06734fc
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
View File

@@ -555,12 +555,22 @@ public class ChartDataServer implements ChartDataApi {
var preRowRange = preRange.get(preRangeIndex);
var start = preRowRange[0];
var end = preRowRange[1];
var lastColValue = data.get(start)[curColIndex].toString();
var lastColValue = data.get(start)[curColIndex];
if (lastColValue != null) {
lastColValue = lastColValue.toString();
} else {
lastColValue = "";
}
var lastRowIndex = start;
for (Integer curRowIndex = start + 1; curRowIndex <= end; curRowIndex++) {
var curRow = data.get(curRowIndex);
var curColValue = curRow[curColIndex].toString();
if (!StringUtils.equals(lastColValue, curColValue) && (curRowIndex - lastRowIndex > 1)) {
var curColValue = curRow[curColIndex];
if (curColValue != null) {
curColValue = curColValue.toString();
} else {
curColValue = "";
}
if (!StringUtils.equals(lastColValue.toString(), curColValue.toString()) && (curRowIndex - lastRowIndex > 1)) {
curRange.add(new Integer[]{lastRowIndex, curRowIndex - 1});
result.add(new CellRangeAddress(lastRowIndex + offsetHeight, curRowIndex + offsetHeight - 1, curColIndex, curColIndex));
}
@@ -568,7 +578,7 @@ public class ChartDataServer implements ChartDataApi {
curRange.add(new Integer[]{lastRowIndex, curRowIndex});
result.add(new CellRangeAddress(lastRowIndex + offsetHeight, curRowIndex + offsetHeight, curColIndex, curColIndex));
}
if (!StringUtils.equals(lastColValue, curColValue)) {
if (!StringUtils.equals(lastColValue.toString(), curColValue.toString())) {
lastColValue = curColValue;
lastRowIndex = curRowIndex;
}