R isError and isSuccess static

2022-10-10 09:22:37 +08:00
parent 186c04d90a
commit 4d72fb4289
2 changed files with 15 additions and 13 deletions
--- 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 @@ public class ExcelUtil<T>
            // 得到导出对象.
            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)
            {