Browse Source
解决导出时包含空子列表数据异常的问题
Signed-off-by: 也曾为你、像超人 <1553592282@qq.com>
newMaster
也曾为你、像超人
3 years ago
committed by
Gitee
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with
5 additions and
0 deletions
-
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
|
|
@ -699,6 +699,11 @@ public class ExcelUtil<T> |
|
|
subList = getListCellValue(vo); |
|
|
subList = getListCellValue(vo); |
|
|
subMergedLastRowNum = subMergedLastRowNum + subList.size(); |
|
|
subMergedLastRowNum = subMergedLastRowNum + subList.size(); |
|
|
} |
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
subMergedFirstRowNum++; |
|
|
|
|
|
subMergedLastRowNum++; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
int column = 0; |
|
|
int column = 0; |
|
|
for (Object[] os : fields) |
|
|
for (Object[] os : fields) |
|
|
|
