From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 f242d8c..4060b17 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
@@ -3,6 +3,7 @@
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.ruoyi.common.convert.ExcelBigNumberConvert;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUtils;
@@ -29,7 +30,7 @@
 	 * @return 杞崲鍚庨泦鍚�
 	 */
 	public static <T> List<T> importExcel(InputStream is, Class<T> clazz) {
-		return EasyExcel.read(is).autoCloseStream(false).sheet().doReadSync();
+		return EasyExcel.read(is).head(clazz).autoCloseStream(false).sheet().doReadSync();
 	}
 
 	/**
@@ -52,6 +53,8 @@
 				.autoCloseStream(false)
 				// 鑷姩閫傞厤
 				.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+				// 澶ф暟鍊艰嚜鍔ㄨ浆鎹� 闃叉澶辩湡
+				.registerConverter(new ExcelBigNumberConvert())
 				.sheet(sheetName).doWrite(list);
 		} catch (IOException e) {
 			throw new RuntimeException("瀵煎嚭Excel寮傚父");

--
Gitblit v1.9.3