RuoYi
2022-10-21 e75c9ff01887e83e5ea04ee8f70b97474034ad37
src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -694,12 +694,19 @@
            // 得到导出对象.
            T vo = (T) list.get(i);
            Collection<?> subList = null;
            if (isSubListValue(vo))
            if (isSubList())
            {
                subList = getListCellValue(vo);
                subMergedLastRowNum = subMergedLastRowNum + subList.size();
                if (isSubListValue(vo))
                {
                    subList = getListCellValue(vo);
                    subMergedLastRowNum = subMergedLastRowNum + subList.size();
                }
                else
                {
                    subMergedFirstRowNum++;
                    subMergedLastRowNum++;
                }
            }
            int column = 0;
            for (Object[] os : fields)
            {