升级pagehelper到最新版1.4.5

RuoYi

2022-10-30 426a8267d4e908ae5f0fc2196642e1b6327fe909

 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)

            {