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

RuoYi

2022-11-11 e0a5e704b0ab25390c431fb54158ec102dfb3f67

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

@@ -562,17 +562,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)

            {

@@ -777,6 +784,10 @@
            {

                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());

        }

        else if (ColumnType.NUMERIC == attr.cellType())