From 8b80a1c10ea0f61108454160b0507466b436227e Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Wed, 17 Aug 2022 09:42:06 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-78365=E3=80=90=E8=BF=AD=E4=BB=A3?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E8=B5=B7=E5=A7=8B=E9=A1=B5=E3=80=91=E4=B8=8D?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E4=BB=BB=E4=BD=95=E6=8A=A5=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E6=8A=A5=E8=A1=A8=E8=81=9A=E5=90=88=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=83=BD=E6=96=B0=E5=BB=BA=E5=A4=B1=E8=B4=A5=20?=
 =?UTF-8?q?=E8=A7=84=E9=81=BF=20npe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/utils/DefaultThemedTemplateCellElementCase.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/utils/DefaultThemedTemplateCellElementCase.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/utils/DefaultThemedTemplateCellElementCase.java
index 64aaeb9c0..123875eef 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/utils/DefaultThemedTemplateCellElementCase.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/utils/DefaultThemedTemplateCellElementCase.java
@@ -33,7 +33,7 @@ public class DefaultThemedTemplateCellElementCase {
 
     private static DefaultTemplateCellElement themingCellElement(DefaultTemplateCellElement cellElement) {
         JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if (template != null) {
+        if (JTemplate.isValid(template)) {
             TemplateTheme theme = template.getTemplateTheme();
             ThemedCellStyle themedCellStyle = theme.getCellStyleList().getUse4Default();
             if (themedCellStyle != null) {