Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复写excel时 集合泛型是数组异常 [Issue #3035] #3591

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修复写excel时 集合泛型是数组异常 [Issue #3035] #3591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
package com.alibaba.excel.write.executor;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.*;

import com.alibaba.excel.context.WriteContext;
import com.alibaba.excel.enums.HeadKindEnum;
Expand Down Expand Up @@ -72,7 +67,9 @@ private void addOneRowOfDataToExcel(Object oneRowData, int rowIndex, int relativ
rowWriteHandlerContext.setRow(row);

WriteHandlerUtils.afterRowCreate(rowWriteHandlerContext);

if (oneRowData.getClass().isArray()) {
oneRowData = new ArrayList<>(Arrays.asList((Object[]) oneRowData));
}
if (oneRowData instanceof Collection<?>) {
addBasicTypeToExcel(new CollectionRowData((Collection<?>)oneRowData), row, rowIndex, relativeRowIndex);
} else if (oneRowData instanceof Map) {
Expand Down