Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pre Merge pull request !462 from 后知后觉/dev-zhy

Browse Source
This commit is contained in:
后知后觉 2022-05-01 12:24:23 +00:00 committed by Gitee
commit c517e3fd62
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -261,13 +261,33 @@ public class ExcelUtil<T>
Map<String, Integer> cellMap = new HashMap<String, Integer>();
// 获取表头
Row heard = sheet.getRow(titleNum);
int nullIndex = 1;
for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
{
Cell cell = heard.getCell(i);
if (StringUtils.isNotNull(cell))
{
String value = this.getCellValue(heard, i).toString();
cellMap.put(value, i);
// 处理表中重复字段标题
if (cellMap.get(value) != null)
{
int repeat = 1;
do
{
repeat++;
} while(cellMap.get(value + repeat) != null);
cellMap.put(value + repeat, i);
}
else
{
cellMap.put(value, i);
}
// 处理多级表头为空的段落
if (StringUtils.isEmpty(value))
{
cellMap.put(nullIndex + "", i);
nullIndex++;
}
}
else
{