From 76b600eeccc40a561d1a9278134ab9a806f2f9e3 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Sat, 12 Dec 2020 22:54:07 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6)?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=20excel=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/531
---
 eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
index 05bf2bb4..ee0a66b6 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -248,7 +248,8 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
                     SXSSFCell currentCell = currentRow.getCell(columnNum);
                     if (currentCell.getCellTypeEnum() == CellType.STRING) {
                         int length = currentCell.getStringCellValue().getBytes().length;
-                        if (columnWidth < length) {
+                        // 如果长度大于最大值 65280，那就取 length
+                        if (columnWidth < length || (columnWidth * 256 > 65280)) {
                             columnWidth = length;
                         }
                     }