ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.2' into 5.2

This commit is contained in:
wujj 2020-10-28 18:12:47 +08:00
parent ef77f3989b 1d2d13d859
commit 3ffe552ffb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/5.2-patch.sql
View File

@ -9,3 +9,6 @@ CHANGE COLUMN `model_app_id` `app_id` int(11) NULL DEFAULT NULL COMMENT '应用
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` int(11) NULL DEFAULT NULL COMMENT '顶级id' AFTER `leaf`;

2
src/main/java/net/mingsoft/cms/dao/IContentDao.xml
View File

@ -219,7 +219,7 @@
</select>
<!--条件查询-->
<select id="query" resultMap="resultContentMap">
select ct.*,CONCAT("/html/",ct.app_id,category_path,"/",ct.id,".html") AS static_url from (
select ct.*,CONCAT('/html/',ct.app_id,category_path,'/',ct.id,'.html') AS static_url from (
select ct.*,cc.category_path from cms_content ct
join cms_category cc on ct.content_category_id=cc.id
<where>