优化导出对象的子列表为空会出现[]问题

RuoYi

2022-11-11 df4e329b084fcad4f8ac9910fc73a8467f86ceae

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

@@ -689,17 +689,24 @@
        int rowNo = (1 + rownum) - startNo;

        for (int i = startNo; i < endNo; i++)

        {

            rowNo = i > 1 ? rowNo + 1 : rowNo + i;

            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;

            row = sheet.createRow(rowNo);

            // 得到导出对象.

            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)

            {

@@ -808,7 +815,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 +848,6 @@
            if (!styles.containsKey(key))

            {

                CellStyle style = wb.createCellStyle();

                style = wb.createCellStyle();

                style.setAlignment(excel.align());

                style.setVerticalAlignment(VerticalAlignment.CENTER);

                style.setBorderRight(BorderStyle.THIN);

@@ -905,6 +910,10 @@
            if (StringUtils.startsWithAny(cellValue, FORMULA_STR))

            {

                cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");

            }

            if (value instanceof Collection && StringUtils.equals("[]", cellValue))

            {

                cellValue = StringUtils.EMPTY;

            }

            cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());

        }

@@ -993,7 +1002,7 @@
            {

                // 创建cell

                cell = row.createCell(column);

                if (isSubListValue(vo) && attr.needMerge())

                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())

                {

                    CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);

                    sheet.addMergedRegion(cellAddress);

@@ -1020,7 +1029,7 @@
                }

                else if (value instanceof BigDecimal && -1 != attr.scale())

                {

                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());

                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue());

                }

                else if (!attr.handler().equals(ExcelHandlerAdapter.class))

                {