Merge 7a2bc3b7d4 into aae9c61ab6

5 months ago · 52ac1e7078
1 changed files with 6 additions and 3 deletions
--- 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) {