From f11ee786cd6510afacd802a78d199767fde1fb7c Mon Sep 17 00:00:00 2001
From: wujj <1027418825@qq.com>
Date: Sat, 5 Dec 2020 10:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/5.2-patch.sql                                |  7 ++++---
 .../WEB-INF/manager/cms/category/index.ftl       | 16 +++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/doc/5.2-patch.sql b/doc/5.2-patch.sql
index 9fd5bb0f..a7534f7b 100644
--- a/doc/5.2-patch.sql
+++ b/doc/5.2-patch.sql
@@ -134,17 +134,18 @@ ALTER TABLE `cms_category` ADD COLUMN `top_id`  bigint(20) NULL DEFAULT NULL COM
 ALTER TABLE `cms_category`
 CHANGE COLUMN `category_parent_id` `category_parent_ids` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父类型编号，多个id逗号' AFTER `mdiy_model_id`;
 ALTER TABLE `cms_category` MODIFY COLUMN `id`  bigint(20) UNSIGNED NOT NULL FIRST ;
+
 UPDATE `cms_category` SET `category_id` = NULL WHERE `category_id` = "";
-ALTER TABLE `cms_category`
-MODIFY COLUMN `category_id` bigint(20) NULL DEFAULT NULL COMMENT '所属栏目' AFTER `id`;
+UPDATE `cms_category` SET `category_id` = NULL WHERE `category_id` = 0;
 ALTER TABLE `cms_category`
 DROP COLUMN `category_manager_id`;
 ALTER TABLE `cms_category`
 DROP COLUMN `app_id`;
 ALTER TABLE `cms_category`
-MODIFY COLUMN `category_id` bigint(20) ZEROFILL NULL DEFAULT NULL COMMENT '所属栏目' AFTER `id`,
+MODIFY COLUMN `category_id` bigint(20) unsigned DEFAULT NULL COMMENT '所属栏目' AFTER `id`,
 MODIFY COLUMN `mdiy_model_id` int(11) NULL DEFAULT NULL COMMENT '栏目管理的内容模型id' AFTER `dict_id`;
 
+
 ALTER TABLE `cms_content`
 CHANGE COLUMN `content_category_id` `category_id` bigint(20) UNSIGNED NULL COMMENT '所属栏目' AFTER `id`;
 ALTER TABLE `cms_content` MODIFY COLUMN `id`  bigint(20) UNSIGNED NOT NULL FIRST ;
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
index 188e0063..97a144fa 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
@@ -201,14 +201,16 @@
 			getDictLabel: function (v) {
 				var that = this;
 				var labels = [];
-				v.split(",").forEach(function (item) {
-					for (var key in that.categoryFlagOptions) {
-						if (item == that.categoryFlagOptions[key].dictValue) {
-							labels.push(that.categoryFlagOptions[key].dictLabel);
-							break;
+				if(v){
+					v.split(",").forEach(function (item) {
+						for (var key in that.categoryFlagOptions) {
+							if (item == that.categoryFlagOptions[key].dictValue) {
+								labels.push(that.categoryFlagOptions[key].dictLabel);
+								break;
+							}
 						}
-					}
-				});
+					});
+				}
 				return labels.toString();
 			},
 			//查询列表