From 4d72fb4289aef2a1b34677ac598e88f4f98e930e Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期一, 10 十月 2022 09:22:37 +0800 Subject: [PATCH] R isError and isSuccess static --- ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index d687641..6137c86 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -694,17 +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++; + } } - else - { - subMergedFirstRowNum++; - subMergedLastRowNum++; - } - int column = 0; for (Object[] os : fields) { -- Gitblit v1.9.2