From 42c9e189c8e1eb28d876c6fb4561fd9df6ac1b6b 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: Thu, 9 Jan 2020 15:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=A9=BA=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mingsoft/cms/dao/IContentDao.xml   | 12 ++++++------
 src/main/webapp/WEB-INF/manager/cms/content/form.ftl |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index d0fd41b5..25fef61f 100644
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -83,7 +83,7 @@
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 				<if test="contentTitle != null and contentTitle != ''">#{contentTitle},</if>
 				<if test="contentCategoryId != null and contentCategoryId != ''">#{contentCategoryId},</if>
-				<if test="contentType != null and contentType != ''">#{contentType},</if>
+				<if test="contentType != null ">#{contentType},</if>
 				<if test="contentDisplay != null and contentDisplay != ''">#{contentDisplay},</if>
 				<if test="contentAuthor != null and contentAuthor != ''">#{contentAuthor},</if>
 				<if test="contentSource != null and contentSource != ''">#{contentSource},</if>
@@ -112,14 +112,14 @@
 				<if test="contentCategoryId != null and contentCategoryId != ''">content_category_id=#{contentCategoryId},</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>
+				<if test="contentAuthor != null ">content_author=#{contentAuthor},</if>
+				<if test="contentSource != null ">content_source=#{contentSource},</if>
 				<if test="contentDatetime != null">content_datetime=#{contentDatetime},</if>
 				<if test="contentSort != null">content_sort=#{contentSort},</if>
 				<if test="contentImg != null and contentImg != ''">content_img=#{contentImg},</if>
-				<if test="contentDescription != null and contentDescription != ''">content_description=#{contentDescription},</if>
-				<if test="contentKeyword != null and contentKeyword != ''">content_keyword=#{contentKeyword},</if>
-				<if test="contentDetails != null and contentDetails != ''">content_details=#{contentDetails},</if>
+				<if test="contentDescription != null ">content_description=#{contentDescription},</if>
+				<if test="contentKeyword != null ">content_keyword=#{contentKeyword},</if>
+				<if test="contentDetails != null ">content_details=#{contentDetails},</if>
 				<if test="contentUrl != null and contentUrl != ''">content_url=#{contentUrl},</if>
 				<if test="contentHit != null">content_hit=#{contentHit},</if>
 				<if test="appId != null">app_id=#{appId},</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 d5be65e5..e8335c22 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -448,6 +448,9 @@
                         if (res.data.contentType) {
                             res.data.contentType = res.data.contentType.split(',');
                         }
+                        else {
+                            res.data.contentType = [];
+                        }
                         if (res.data.contentImg) {
                             res.data.contentImg = JSON.parse(res.data.contentImg);
                             res.data.contentImg.forEach(function (value) {