From 7a2bc3b7d4ec0eaaef8e5c32567ee3227e422dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=93=9D=E5=A3=AB=E9=92=A6?= Date: Fri, 2 Jun 2023 07:45:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8E=E9=BB=98=E8=AE=A4=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bugfix for https://github.com/alibaba/easyexcel/issues/3003 --- .../excel/write/metadata/style/WriteCellStyle.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java b/easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java index bebd210e..dafac0b8 100644 --- a/easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java +++ b/easyexcel-core/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java @@ -161,10 +161,13 @@ public class WriteCellStyle { } } if (source.getWriteFont() != null) { - if (target.getWriteFont() == null) { - target.setWriteFont(source.getWriteFont()); + WriteFont targetWriteFont = target.getWriteFont(); + if (targetWriteFont == null) { + targetWriteFont = new WriteFont(); + WriteFont.merge(source.getWriteFont(), targetWriteFont); + target.setWriteFont(targetWriteFont); } else { - WriteFont.merge(source.getWriteFont(), target.getWriteFont()); + WriteFont.merge(source.getWriteFont(), targetWriteFont); } } if (source.getHidden() != null) {