diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
index 1448f528c..b5ac390e8 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
@@ -1335,17 +1335,16 @@ public class ExcelWriter extends ExcelBase<ExcelWriter> {
 		}
 
 		final Map<Object, Object> filteredMap = MapUtil.newHashMap(rowMap.size(), true);
-		String aliasName;
-		for (Entry<?, ?> entry : rowMap.entrySet()) {
-			aliasName = this.headerAlias.get(StrUtil.toString(entry.getKey()));
+		rowMap.forEach((key, value)->{
+			final String aliasName = this.headerAlias.get(StrUtil.toString(key));
 			if (null != aliasName) {
 				// 别名键值对加入
-				filteredMap.put(aliasName, entry.getValue());
+				filteredMap.put(aliasName, value);
 			} else if (false == this.onlyAlias) {
 				// 保留无别名设置的键值对
-				filteredMap.put(entry.getKey(), entry.getValue());
+				filteredMap.put(key, value);
 			}
-		}
+		});
 		return filteredMap;
 	}
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
index 7b5ede79b..241cb3424 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
@@ -2,6 +2,7 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.Map;
 public class Issue2221Test {
 
 	@Test
-	//@Ignore
+	@Ignore
 	public void writeDuplicateHeaderAliasTest(){
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/duplicateAlias.xlsx");
 		// 设置别名