From 1de2b7a57e13928f0c963d308cea65d10149c1a9 Mon Sep 17 00:00:00 2001
From: lihy2021 <lihy2021@hotmail.com>
Date: 星期四, 27 十月 2022 09:25:39 +0800
Subject: [PATCH] 优化代码
---
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