修复Excel自定义格式样式污染问题

RuoYi

2026-01-06 e942847b899e316efa1fa463b9c38c5c688b3ae7

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

@@ -147,12 +147,12 @@
    /**

     * 对象的子列表方法

     */

    private Map<String, Method> subMethods = new HashMap<>();

    private Map<String, Method> subMethods;



    /**

     * 对象的子列表属性

     */

    private Map<String, List<Field>> subFieldsMap = new HashMap<>();

    private Map<String, List<Field>> subFieldsMap;



    /**

     * 统计列表

@@ -225,7 +225,10 @@
            int titleLastCol = this.fields.size() - 1;

            if (isSubList())

            {

                titleLastCol = titleLastCol + subFieldsMap.values().size() - 1;

                for (List<Field> currentSubFields : subFieldsMap.values())

                {

                    titleLastCol = titleLastCol + currentSubFields.size() - 1;

                }

            }

            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);

            titleRow.setHeightInPoints(30);

@@ -610,10 +613,10 @@
                    try

                    {

                        Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel);

                        List<Field> currentSubFields = subFieldsMap.get(field.getName());

                        if (subList != null && !subList.isEmpty())

                        {

                            int subIndex = 0;

                            List<Field> currentSubFields = subFieldsMap.get(field.getName());

                            for (Object subVo : subList)

                            {

                                Row subRow = sheet.getRow(currentRowNum + subIndex);

@@ -630,8 +633,8 @@
                                }

                                subIndex++;

                            }

                            column += currentSubFields.size();

                        }

                        column += currentSubFields.size();

                    }

                    catch (Exception e)

                    {

@@ -1000,7 +1003,7 @@
                String separator = attr.separator();

                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))

                {

                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));

                    cell.setCellStyle(createCellStyle(cell.getCellStyle(), dateFormat));

                    cell.setCellValue(parseDateToStr(dateFormat, value));

                }

                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))

@@ -1028,6 +1031,21 @@
            log.error("导出Excel失败{}", e);

        }

        return cell;

    }



    /**

     * 使用自定义格式，同时避免样式污染

     * 
     * @param cellStyle 从此样式复制

     * @param format 格式匹配的字符串

     * @return 格式化后CellStyle对象

     */

    private CellStyle createCellStyle(CellStyle cellStyle, String format)

    {

        CellStyle style = wb.createCellStyle();

        style.cloneStyleFrom(cellStyle);

        style.setDataFormat(wb.getCreationHelper().createDataFormat().getFormat(format));

        return style;

    }



    /**

@@ -1348,6 +1366,8 @@
    {

        List<Object[]> fields = new ArrayList<Object[]>();

        List<Field> tempFields = new ArrayList<>();

        subFieldsMap = new HashMap<>();

        subMethods = new HashMap<>();

        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));

        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));

        if (StringUtils.isNotEmpty(includeFields))