Browse Source

Merge pull request !2732 from 陆沉/master

4.1.3.A
jueyue 9 years ago
parent
commit
63fac3ac35
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java

+ 2
- 2
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java View File

@@ -80,7 +80,7 @@ public abstract class ExcelExportBase extends ExportBase {
}
// 存在依赖关系
if (mergeEntity.getText().equals(text)) {
for (int i = 0; i > delys.length; i++) {
for (int i = 0; i < delys.length; i++) {
if (!getCellNotNullText(cell, delys[i], rowNum).equals(
mergeEntity.getRelyList().get(i))) {
return false;
@@ -483,7 +483,7 @@ public abstract class ExcelExportBase extends ExportBase {
}
}
if (mergeDataMap.size() > 0) {
for (Integer index : sets) {
for (Integer index : mergeDataMap.keySet()) {
sheet.addMergedRegion(new CellRangeAddress(mergeDataMap.get(index).getStartRow(),
mergeDataMap.get(index).getEndRow(), index, index));
}


Loading…
Cancel
Save