!595 解决导出时包含空子列表数据异常的问题 Merge pull request !595 from 也曾为你、像超人/N/A

若依

2022-10-10 186c04d90a5ed5891ede09bcebc35141b22a652b

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

@@ -699,6 +699,11 @@
                subList = getListCellValue(vo);

                subMergedLastRowNum = subMergedLastRowNum + subList.size();

            }

            else

            {

                subMergedFirstRowNum++;

                subMergedLastRowNum++;

            }



            int column = 0;

            for (Object[] os : fields)

@@ -808,7 +813,6 @@
            if (!headerStyles.containsKey(key))

            {

                CellStyle style = wb.createCellStyle();

                style = wb.createCellStyle();

                style.cloneStyleFrom(styles.get("data"));

                style.setAlignment(HorizontalAlignment.CENTER);

                style.setVerticalAlignment(VerticalAlignment.CENTER);

@@ -842,7 +846,6 @@
            if (!styles.containsKey(key))

            {

                CellStyle style = wb.createCellStyle();

                style = wb.createCellStyle();

                style.setAlignment(excel.align());

                style.setVerticalAlignment(VerticalAlignment.CENTER);

                style.setBorderRight(BorderStyle.THIN);