From 302c5188292c4c746f88eface31eb5892ba4b137 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 7 Apr 2023 19:17:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CMS=E7=9A=84=E6=A0=8F?= =?UTF-8?q?=E7=9B=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/modules/cms/entity/Article.java | 2 +- .../com/jeesite/modules/cms/entity/Category.java | 12 +++++------- .../jeesite/modules/cms/service/ArticleService.java | 5 +++-- .../jeesite/modules/cms/service/CategoryService.java | 10 +++------- .../core/src/main/resources/config/jeesite-core.yml | 10 ++++++++++ 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java index 24bf8ef2..84d61e32 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java @@ -60,7 +60,7 @@ import java.util.Date; @Column(name = "site_code"), @Column(name = "site_name"), }) - }, orderBy = "a.update_date DESC" + }, orderBy = "a.update_date DESC", extWhereKeys = "dsfCategory" ) public class Article extends DataEntity
{ diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java index ff28f4b9..f69027a0 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java @@ -4,12 +4,6 @@ */ package com.jeesite.modules.cms.entity; -import java.util.List; - -import javax.validation.constraints.NotBlank; - -import javax.validation.constraints.Size; - import com.jeesite.common.collect.ListUtils; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.entity.Extend; @@ -20,6 +14,10 @@ import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; import com.jeesite.modules.cms.utils.CmsUtils; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.List; + /** * 栏目表Entity * @author 长春叭哥、ThinkGem @@ -45,7 +43,7 @@ import com.jeesite.modules.cms.utils.CmsUtils; on = "s.site_code = a.site_code", columns = { @Column(name = "site_name"), }) - }, orderBy = "a.tree_sorts, a.category_code" + }, orderBy = "a.tree_sorts, a.category_code", extWhereKeys = "dsfCategory" ) public class Category extends TreeEntity { diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java index 49ec54bf..e5d7e221 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java @@ -71,8 +71,9 @@ public class ArticleService extends CrudService { * 添加数据权限 */ @Override - public void addDataScopeFilter(Article entity) { - + public void addDataScopeFilter(Article entity, String ctrlPermi) { + entity.sqlMap().getDataScope().addFilter("dsfCategory", + "Category", "a.category_code", "a.create_by", ctrlPermi); } /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java index ec0e3e90..f5e70e03 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java @@ -4,13 +4,11 @@ */ package com.jeesite.modules.cms.service; -import com.jeesite.common.lang.StringUtils; import com.jeesite.common.service.TreeService; import com.jeesite.modules.cms.dao.CategoryDao; import com.jeesite.modules.cms.entity.Category; import com.jeesite.modules.cms.utils.CmsUtils; import com.jeesite.modules.file.utils.FileUploadUtils; -import org.apache.commons.text.StringEscapeUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,8 +36,9 @@ public class CategoryService extends TreeService { * 添加数据权限 */ @Override - public void addDataScopeFilter(Category entity) { - + public void addDataScopeFilter(Category entity, String ctrlPermi) { + entity.sqlMap().getDataScope().addFilter("dsfCategory", + "Category", "a.category_code", "a.create_by", ctrlPermi); } /** @@ -59,9 +58,6 @@ public class CategoryService extends TreeService { @Override @Transactional public void save(Category category) { - if (StringUtils.isNotBlank(category.getViewConfig())){ - category.setViewConfig(StringEscapeUtils.unescapeHtml4(category.getViewConfig())); - } super.save(category); CmsUtils.removeCache("mainNavList_"+category.getSite().getId()); // 保存上传图片 diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 1017b90f..92eb7399 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -187,6 +187,16 @@ user: chkboxType: {"Y":"ps","N":"ps"}, expandLevel: -1, remarks: "" + },{ + moduleCode: "cms", + ctrlName: "栏目权限", + ctrlName_en: "Category", + ctrlType: "Category", + ctrlPermi: "0", + ctrlDataUrl: "/cms/category/treeData", + chkboxType: {"Y":"ps","N":"ps"}, + expandLevel: -1, + remarks: "" }] # 数据权限调试模式（会输出一些日志）