Merge pull request #15941 in DESIGN/design from fbp/feature to fbp/research

* commit '6dc02b1d76b7432ccd26197d8f8a1ee5cf1ca52f':
  REPORT-144979 【FR12】多租户环境不能新建模板

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -2049,9 +2049,11 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             themeAttrMark = new TemplateThemeAttrMark();
             getTarget().addAttrMark(themeAttrMark);
         }
+        if (theme != null) {
             themeAttrMark.setName(theme.getName());
             themeAttrMark.setDark(theme.isDark());
         }
+    }
 
     public String getTemplateOpenFailedTip() {
         return templateOpenFailedTip;