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

fix 修复fill填充空数据，可能导致行数据错乱的问题 #3792

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix 修复fill填充空数据，可能导致行数据错乱的问题 #3792

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c34462
fix 修复fill填充空数据，可能导致行数据错乱的问题
psxjoy May 16, 2024
2814ded
Merge branch 'alibaba:master' into master
psxjoy May 24, 2024
94297c9
Merge branch 'alibaba:master' into master
psxjoy Jul 31, 2024
31151af
Merge branch 'alibaba:master' into master
psxjoy Sep 11, 2024
2658c4e
Merge branch 'alibaba:master' into master
psxjoy Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ private void doFill(List<AnalysisCell> analysisCellList, Object oneRowData, Fill

if (analysisCell.getOnlyOneVariable()) {
String variable = analysisCell.getVariableList().get(0);
if (!dataKeySet.contains(variable)) {
continue;
Object value =null;
if (dataKeySet.contains(variable)) {
value = dataMap.get(variable);
}
Object value = dataMap.get(variable);
ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap,
writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable,
writeContext.currentWriteHolder());
Expand Down Expand Up @@ -247,10 +247,10 @@ private void doFill(List<AnalysisCell> analysisCellList, Object oneRowData, Fill

for (String variable : analysisCell.getVariableList()) {
cellValueBuild.append(analysisCell.getPrepareDataList().get(index++));
if (!dataKeySet.contains(variable)) {
continue;
Object value =null;
if (dataKeySet.contains(variable)) {
value = dataMap.get(variable);
}
Object value = dataMap.get(variable);
ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap,
writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable,
writeContext.currentWriteHolder());
Expand Down