|
@@ -694,17 +694,19 @@ public class ExcelUtil<T> |
|
@@ -694,17 +694,19 @@ public class ExcelUtil<T> |
|
694
|
// 得到导出对象.
|
694
|
// 得到导出对象.
|
|
695
|
T vo = (T) list.get(i);
|
695
|
T vo = (T) list.get(i);
|
|
696
|
Collection<?> subList = null;
|
696
|
Collection<?> subList = null;
|
|
697
|
- if (isSubListValue(vo))
|
|
|
|
698
|
- {
|
|
|
|
699
|
- subList = getListCellValue(vo);
|
|
|
|
700
|
- subMergedLastRowNum = subMergedLastRowNum + subList.size();
|
|
|
|
701
|
- }
|
|
|
|
702
|
- else
|
697
|
+ if (isSubList())
|
|
703
|
{
|
698
|
{
|
|
704
|
- subMergedFirstRowNum++;
|
|
|
|
705
|
- subMergedLastRowNum++;
|
699
|
+ if (isSubListValue(vo))
|
|
|
|
700
|
+ {
|
|
|
|
701
|
+ subList = getListCellValue(vo);
|
|
|
|
702
|
+ subMergedLastRowNum = subMergedLastRowNum + subList.size();
|
|
|
|
703
|
+ }
|
|
|
|
704
|
+ else
|
|
|
|
705
|
+ {
|
|
|
|
706
|
+ subMergedFirstRowNum++;
|
|
|
|
707
|
+ subMergedLastRowNum++;
|
|
|
|
708
|
+ }
|
|
706
|
}
|
709
|
}
|
|
707
|
-
|
|
|
|
708
|
int column = 0;
|
710
|
int column = 0;
|
|
709
|
for (Object[] os : fields)
|
711
|
for (Object[] os : fields)
|
|
710
|
{
|
712
|
{
|