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

author:yysforget date:20240605 for：当参数设置中表头行数大于2是保留原有设置 #117

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

author:yysforget date:20240605 for：当参数设置中表头行数大于2是保留原有设置 #117

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion autopoi/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,11 @@ private Map<Integer, String> getTitleMap(Sheet sheet, Iterator<Row> rows, Import

//设置表头行数
if (ExcelUtil.isMergedRegion(sheet, headRow.getRowNum(), 0)) {
params.setHeadRows(2);
//update_begin-author:yysforget date:20240605 for：当参数设置中表头行数大于2是保留原有设置
if (params.getHeadRows() <= 1) {
params.setHeadRows(2);
}
//update-end-author:yysforget date:20240605 for：当参数设置中表头行数大于2是保留原有设置
}else{
params.setHeadRows(1);
}
Expand Down