From f01aa3739461c2a5014c9ddea22d6e619b3bf696 Mon Sep 17 00:00:00 2001
From: BlossomWave <316975215@qq.com>
Date: 星期一, 24 十月 2022 16:25:33 +0800
Subject: [PATCH] update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 默认修改头像时如果上传的图片为png透明图片，生成的头像透明部分会变成黑色，修改了生成头像为png格式。可正常显示图片透明部分。
---
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