From 68cce8c42b699dde10d48b88825bd89f42f456c0 Mon Sep 17 00:00:00 2001
From: xierz <aa1343211992@163.com>
Date: Sat, 31 Oct 2020 10:47:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mingsoft/cms/action/ContentAction.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/action/ContentAction.java b/src/main/java/net/mingsoft/cms/action/ContentAction.java
index b542ed96..9c9c5b21 100644
--- a/src/main/java/net/mingsoft/cms/action/ContentAction.java
+++ b/src/main/java/net/mingsoft/cms/action/ContentAction.java
@@ -22,6 +22,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -183,11 +184,11 @@ public class ContentAction extends BaseAction {
 	@LogAnn(title = "删除文章", businessType = BusinessTypeEnum.DELETE)
 	@RequiresPermissions("cms:content:del")
 	public ResultData delete(@RequestBody List<ContentEntity> contents, HttpServletResponse response, HttpServletRequest request) {
-		int[] ids = new int[contents.size()];
+		List<String> ids = new ArrayList<>();
 		for(int i = 0;i<contents.size();i++){
-			ids[i] =Integer.parseInt(contents.get(i).getId()) ;
+			ids.add(contents.get(i).getId());
 		}
-		contentBiz.delete(ids);
+		contentBiz.removeByIds(ids);
 		return ResultData.build().success();
 	}
 	/**

From 8c0b4a50b13b448c50f03ccfff3f7ac4aa71edea Mon Sep 17 00:00:00 2001
From: wujj <1027418825@qq.com>
Date: Sat, 31 Oct 2020 10:48:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?SQL=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/5.2-patch.sql | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/doc/5.2-patch.sql b/doc/5.2-patch.sql
index 011d965b..f3fbb715 100644
--- a/doc/5.2-patch.sql
+++ b/doc/5.2-patch.sql
@@ -1,9 +1,4 @@
-ALTER TABLE `mdiy_model`
-CHANGE COLUMN `model_app_id` `app_id`  int(11) NULL DEFAULT NULL COMMENT '应用编号' AFTER `model_json`;
-
-ALTER TABLE `mdiy_dict`
-ADD COLUMN `dict_enable`  varchar(11) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '1' COMMENT '启用状态' AFTER `is_child`;
-
+
 ALTER TABLE `cms_category` ADD COLUMN `leaf`  bigint(1) NULL DEFAULT NULL COMMENT '是否是叶子节点' AFTER `category_pinyin`;
 ALTER TABLE `cms_category` ADD COLUMN `top_id`  bigint(20) NULL DEFAULT NULL COMMENT '顶级id' AFTER `leaf`;
 ALTER TABLE `cms_category` MODIFY COLUMN `id`  bigint(20) UNSIGNED NOT NULL FIRST ;