From f4a2f909a779d0d2ffa8d5256b3d48648f65e761 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 26 Sep 2021 09:03:28 +0800
Subject: [PATCH] Excel注解支持导入导出标题信息
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
index 1c87e75..95a00b7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -797,7 +797,21 @@
}
else if (obj instanceof byte[] || obj instanceof Byte[])
{
- return str((Byte[]) obj, charset);
+ if (obj instanceof byte[])
+ {
+ return str((byte[]) obj, charset);
+ }
+ else
+ {
+ Byte[] bytes = (Byte[]) obj;
+ int length = bytes.length;
+ byte[] dest = new byte[length];
+ for (int i = 0; i < length; i++)
+ {
+ dest[i] = bytes[i];
+ }
+ return str(dest, charset);
+ }
}
else if (obj instanceof ByteBuffer)
{
--
Gitblit v1.9.3