This commit is contained in:
Looly 2022-03-30 01:55:02 +08:00
parent 2fb27b5dfb
commit b8f0f7efdb
2 changed files with 7 additions and 7 deletions

View File

@ -1335,17 +1335,16 @@ public class ExcelWriter extends ExcelBase<ExcelWriter> {
} }
final Map<Object, Object> filteredMap = MapUtil.newHashMap(rowMap.size(), true); final Map<Object, Object> filteredMap = MapUtil.newHashMap(rowMap.size(), true);
String aliasName; rowMap.forEach((key, value)->{
for (Entry<?, ?> entry : rowMap.entrySet()) { final String aliasName = this.headerAlias.get(StrUtil.toString(key));
aliasName = this.headerAlias.get(StrUtil.toString(entry.getKey()));
if (null != aliasName) { if (null != aliasName) {
// 别名键值对加入 // 别名键值对加入
filteredMap.put(aliasName, entry.getValue()); filteredMap.put(aliasName, value);
} else if (false == this.onlyAlias) { } else if (false == this.onlyAlias) {
// 保留无别名设置的键值对 // 保留无别名设置的键值对
filteredMap.put(entry.getKey(), entry.getValue()); filteredMap.put(key, value);
} }
} });
return filteredMap; return filteredMap;
} }

View File

@ -2,6 +2,7 @@ package cn.hutool.poi.excel;
import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import java.util.List; import java.util.List;
@ -10,7 +11,7 @@ import java.util.Map;
public class Issue2221Test { public class Issue2221Test {
@Test @Test
//@Ignore @Ignore
public void writeDuplicateHeaderAliasTest(){ public void writeDuplicateHeaderAliasTest(){
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/duplicateAlias.xlsx"); final ExcelWriter writer = ExcelUtil.getWriter("d:/test/duplicateAlias.xlsx");
// 设置别名 // 设置别名