From 69c22679c33e711f0c8df0379781a6c3fd23a142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B0=E6=95=A3=E5=9C=A8=E6=97=B6=E5=85=89=E9=87=8C?=
 <954441582@qq.com>
Date: Tue, 7 Jan 2020 10:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E7=A9=BA=E5=80=BC?=
 =?UTF-8?q?=E3=80=82=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E6=96=87=E7=AB=A0=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/mingsoft/cms/action/web/MCmsAction.java   | 10 ++++++----
 src/main/java/net/mingsoft/cms/dao/IContentDao.xml     |  4 ++--
 src/main/webapp/WEB-INF/manager/cms/content/form.ftl   |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
index 01d46768..638b5b9c 100644
--- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
+++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
@@ -26,8 +26,10 @@ import cn.hutool.core.util.PageUtil;
 import freemarker.core.ParseException;
 import freemarker.template.MalformedTemplateNameException;
 import freemarker.template.TemplateNotFoundException;
+import net.mingsoft.base.constant.Const;
 import net.mingsoft.basic.util.BasicUtil;
 import net.mingsoft.basic.util.SpringUtil;
+import net.mingsoft.basic.util.StringUtil;
 import net.mingsoft.cms.bean.ContentBean;
 import net.mingsoft.cms.biz.ICategoryBiz;
 import net.mingsoft.cms.biz.IContentBiz;
@@ -39,19 +41,19 @@ import net.mingsoft.mdiy.biz.IContentModelBiz;
 import net.mingsoft.mdiy.biz.IModelBiz;
 import net.mingsoft.mdiy.biz.IPageBiz;
 import net.mingsoft.mdiy.entity.ContentModelEntity;
+import net.mingsoft.mdiy.entity.ModelEntity;
 import net.mingsoft.mdiy.entity.PageEntity;
+import net.mingsoft.mdiy.parser.TagParser;
 import net.mingsoft.mdiy.util.ParserUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.*;
 
 /**
diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index 1e680907..d0fd41b5 100644
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -61,7 +61,7 @@
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 				<if test="contentTitle != null and contentTitle != ''">content_title,</if>
 				<if test="contentCategoryId != null and contentCategoryId != ''">content_category_id,</if>
-				<if test="contentType != null and contentType != ''">content_type,</if>
+				<if test="contentType != null ">content_type,</if>
 				<if test="contentDisplay != null and contentDisplay != ''">content_display,</if>
 				<if test="contentAuthor != null and contentAuthor != ''">content_author,</if>
 				<if test="contentSource != null and contentSource != ''">content_source,</if>
@@ -110,7 +110,7 @@
 			<set>
 				<if test="contentTitle != null and contentTitle != ''">content_title=#{contentTitle},</if>
 				<if test="contentCategoryId != null and contentCategoryId != ''">content_category_id=#{contentCategoryId},</if>
-				<if test="contentType != null and contentType != ''">content_type=#{contentType},</if>
+				<if test="contentType != null ">content_type=#{contentType},</if>
 				<if test="contentDisplay != null and contentDisplay != ''">content_display=#{contentDisplay},</if>
 				<if test="contentAuthor != null and contentAuthor != ''">content_author=#{contentAuthor},</if>
 				<if test="contentSource != null and contentSource != ''">content_source=#{contentSource},</if>
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
index 02ef92c0..d5be65e5 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -397,7 +397,7 @@
                         ms.http.get(ms.manager + "/mdiy/model/get.do",{
                             id:this.currCategory.mdiyModelId
                         }).then(function (data) {
-                            if(data.data.id){
+                            if(data.data && data.data.id){
                                 that.rederModel(data.data,JSON.parse(data.data.modelJson))
                             }
                         })