diff --git a/pom.xml b/pom.xml index 856c3aa4..5c7b5473 100644 --- a/pom.xml +++ b/pom.xml @@ -49,19 +49,19 @@ net.mingsoft ms-basic - 2.1.20 + 2.1.20.1 net.mingsoft ms-mdiy - 2.1.20 + 2.1.20.1 net.mingsoft store-client - 2.1.20 + 2.1.20.1 com.github.oshi diff --git a/src/main/java/net/mingsoft/cms/action/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/CategoryAction.java index 8292d0f0..50ff2c24 100755 --- a/src/main/java/net/mingsoft/cms/action/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/CategoryAction.java @@ -40,6 +40,7 @@ import net.mingsoft.basic.util.StringUtil; import net.mingsoft.cms.biz.ICategoryBiz; import net.mingsoft.cms.constant.e.CategoryTypeEnum; import net.mingsoft.cms.entity.CategoryEntity; +import net.mingsoft.cms.entity.ContentEntity; import net.mingsoft.mdiy.util.ParserUtil; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; diff --git a/src/main/java/net/mingsoft/cms/aop/CategoryAop.java b/src/main/java/net/mingsoft/cms/aop/CategoryAop.java index fca2d715..03a8cdb1 100644 --- a/src/main/java/net/mingsoft/cms/aop/CategoryAop.java +++ b/src/main/java/net/mingsoft/cms/aop/CategoryAop.java @@ -6,8 +6,13 @@ package net.mingsoft.cms.aop; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.Query; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import net.mingsoft.base.entity.ResultData; @@ -32,6 +37,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.io.File; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -126,9 +132,13 @@ public class CategoryAop extends net.mingsoft.basic.aop.BaseAop { ? returnCategory.getId() : parent.getCategoryParentIds() + "," + returnCategory.getId(); if (!StringUtils.equals(returnCategory.getCategoryType(), CategoryTypeEnum.LIST.toString())) { // 如果子栏目不为列表,将直接删除父栏目下的文章 - LambdaUpdateWrapper contentDeleteWrapper = new UpdateWrapper().lambda(); + LambdaQueryWrapper contentDeleteWrapper = new QueryWrapper().lambda(); contentDeleteWrapper.eq(ContentEntity::getCategoryId, parent.getId()); - contentDao.delete(contentDeleteWrapper); + List list = contentDao.selectList(contentDeleteWrapper); + if (CollectionUtil.isNotEmpty(list)) { + String[] ids = ArrayUtil.toArray(list.stream().map(ContentEntity::getId).collect(Collectors.toList()), String.class); + contentDao.delete(ids); + } } // 将父栏目下的文章移动到子栏目下 LambdaUpdateWrapper contentWrapper = new UpdateWrapper().lambda(); diff --git a/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java index af789537..14ade9ce 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java @@ -188,8 +188,8 @@ public class CategoryBizImpl extends BaseBizImpl i if (StringUtils.isEmpty(entity.getCategoryParentIds())) { entity.setCategoryParentIds(null); } -// categoryDao.updateEntity(entity); - categoryDao.updateById(entity); + categoryDao.updateEntity(entity); +// categoryDao.updateById(entity); //更新子节点所有父节点id和topid //如果本节点的topid为0（顶级栏目）,则把自身的id作为子栏目的topid，非0所有的子栏目和本栏目使用同一个topid String topId = entity.getTopId(); diff --git a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml index 27d0d1a4..923ffa23 100755 --- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml @@ -40,7 +40,7 @@ update cms_category category_title=#{categoryTitle}, - category_short_title=#{categoryShortTitle}, + category_short_title=#{categoryShortTitle}, category_pinyin=#{categoryPinyin}, top_id=#{topId}, leaf=#{leaf}, diff --git a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java index 6c44f0ea..a4646514 100755 --- a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java @@ -71,7 +71,7 @@ public class CategoryEntity extends BaseEntity { /** * 所属栏目 */ - @TableField(insertStrategy = FieldStrategy.NOT_EMPTY, updateStrategy = FieldStrategy.NOT_EMPTY, whereStrategy = FieldStrategy.NOT_EMPTY) + @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED, whereStrategy = FieldStrategy.NOT_EMPTY) private String categoryId; /** * 栏目管理属性 @@ -84,10 +84,12 @@ public class CategoryEntity extends BaseEntity { /** * 列表模板 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String categoryListUrl; /** * 内容模板 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String categoryUrl; /** * 栏目管理关键字 @@ -125,11 +127,13 @@ public class CategoryEntity extends BaseEntity { /** * 文章管理的内容模型id */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String mdiyModelId; /** * 栏目管理的内容模型id */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String mdiyCategoryModelId; /** diff --git a/src/main/webapp/template/1/default/head-file.htm b/src/main/webapp/template/1/default/head-file.htm new file mode 100644 index 00000000..b5cd6c95 --- /dev/null +++ b/src/main/webapp/template/1/default/head-file.htm @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file