From 30acc93b3cdeee66b895df685b42c6a5eaf53372 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 8 Apr 2023 13:34:00 +0800 Subject: [PATCH] =?UTF-8?q?CMS=E6=A0=B9=E6=8D=AE=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E6=A0=8F=E7=9B=AE=E7=9A=84=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/cms/entity/Article.java | 15 ++++++++------- .../modules/cms/web/ArticleController.java | 15 ++++++++------- .../modules/cms/web/CategoryController.java | 4 ++-- .../resources/views/modules/cms/articleForm.html | 2 +- 4 files changed, 19 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 84d61e32..1e533d89 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 @@ -25,7 +25,7 @@ import java.util.Date; */ @Table(name = "${_prefix}cms_article", alias = "a", columns = { @Column(name = "id", attrName = "id", label = "编号", isPK = true), - @Column(name = "category_code", attrName = "category.categoryCode", label = "栏目编码"), + @Column(name = "category_code", attrName = "category.categoryCode", label = "栏目编码", isQuery = false), @Column(name = "module_type", attrName = "moduleType", label = "模块类型"), @Column(name = "title", attrName = "title", label = "内容标题", queryType = QueryType.LIKE), @Column(name = "href", attrName = "href", label = "外部链接"), @@ -43,16 +43,17 @@ import java.util.Date; @Column(name = "word_count", attrName = "wordCount", label = "字数", comment = "字数（不包含html）"), @Column(name = "custom_content_view", attrName = "customContentView", label = "自定义内容视图"), @Column(name = "view_config", attrName = "viewConfig", label = "视图配置"), - @Column(name="status", attrName="status", label="状态", isUpdate=false), - @Column(name="create_by", attrName="createBy", label="创建者", isUpdate=true), - @Column(name="create_date", attrName="createDate", label="创建时间", isUpdate=false, isQuery=false), - @Column(name="update_by", attrName="updateBy", label="更新者", isUpdate=true), - @Column(name="update_date", attrName="updateDate", label="更新时间", isUpdate=true, isQuery=false), - @Column(name="remarks", attrName="remarks", label="备注信息", queryType=QueryType.LIKE), + @Column(name = "status", attrName = "status", label = "状态", isUpdate = false), + @Column(name = "create_by", attrName = "createBy", label = "创建者"), + @Column(name = "create_date", attrName = "createDate", label = "创建时间", isUpdate = false, isQuery = false), + @Column(name = "update_by", attrName = "updateBy", label = "更新者"), + @Column(name = "update_date", attrName = "updateDate", label = "更新时间", isQuery = false), + @Column(name = "remarks", attrName = "remarks", label = "备注信息", queryType = QueryType.LIKE), @Column(includeEntity = BaseEntity.class), }, joinTable = { @JoinTable(entity = Category.class, alias = "c", on = "c.category_code = a.category_code", columns = { + @Column(name = "category_code", isPK = true), @Column(name = "category_name"), }), @JoinTable(entity = Site.class, attrName = "category.site", alias = "s", diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java index ad65abc0..333cb150 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/ArticleController.java @@ -70,7 +70,7 @@ public class ArticleController extends BaseController { // 栏目展现模式，当为（3：简介类栏目，栏目第一条内容）时，自动维护第一条内容 if (Category.SHOW_MODES_FIRST_CONTENT.equals(article.getCategory().getShowModes())) { // 获取文章内容 - Page
page = new Page
(1, 1, -1); + Page
page = new Page<>(1, 1, -1); article.setPage(page); page = articleService.findPage(article); if (page.getList().size() > 0) { @@ -94,8 +94,12 @@ public class ArticleController extends BaseController { if (StringUtils.isBlank(article.getCategory().getSite().getSiteCode())) { article.getCategory().setSite(new Site(Site.getCurrentSiteCode())); } + // 查询指定栏目以及下级栏目的文章（如果不需要，可以注释掉） + if (StringUtils.isNotBlank(article.getCategory().getCategoryCode())) { + article.getCategory().setIsQueryChildren(true); + } // 是否查询全部，不过滤权限 - if (!(isAll != null && isAll)) { + if (!(isAll != null && isAll) || Global.isStrictMode()){ articleService.addDataScopeFilter(article); } if (!article.currentUser().isAdmin()) { @@ -123,14 +127,11 @@ public class ArticleController extends BaseController { categoryParam.setParentCode(article.getCategory().getCategoryCode()); List list = categoryService.findList(categoryParam); if (list.size() > 0) { - article.setCategory(null); + article.setCategory(null); // 不允许在父节点上添加文章 } else { - article.setCategory(categoryService.get(article.getCategory().getId())); + article.setCategory(CmsUtils.getCategory(article.getCategory().getCategoryCode())); } } -// if (article.getCategory()=null && StringUtils.isNotBlank(article.getCategory().getId())){ -// Category category = categoryService.get(article.getCategory().getId()); -// } if (StringUtils.isBlank(article.getId())) { article.setStatus(Article.STATUS_DRAFT); } diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java b/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java index 8c821c43..e7bf1bde 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/web/CategoryController.java @@ -103,7 +103,7 @@ public class CategoryController extends BaseController { // 创建并初始化下一个节点信息 category = createNextNode(category); if (category.getParent() != null && StringUtils.isNotBlank(category.getParent().getId())) { - category.setParent(categoryService.get(category.getParent().getCategoryCode())); + category.setParent(CmsUtils.getCategory(category.getParent().getCategoryCode())); if (category.getIsNewRecord()) { Category categoryChild = new Category(); categoryChild.setParent(new Category(category.getParentCode())); @@ -270,7 +270,7 @@ public class CategoryController extends BaseController { category.setModuleType(module); } // 是否查询全部，不过滤权限 - if (!(isAll != null && isAll)) { + if (!(isAll != null && isAll) || Global.isStrictMode()){ categoryService.addDataScopeFilter(category); } list = categoryService.findList(category); diff --git a/modules/cms/src/main/resources/views/modules/cms/articleForm.html b/modules/cms/src/main/resources/views/modules/cms/articleForm.html index c1e345b0..ab5f930b 100644 --- a/modules/cms/src/main/resources/views/modules/cms/articleForm.html +++ b/modules/cms/src/main/resources/views/modules/cms/articleForm.html @@ -24,7 +24,7 @@ <#form:treeselect id="category" title="${text('所属栏目')}" path="category.categoryCode" labelPath="category.categoryName" url="${ctx}/cms/category/treeData?excludeCode=${article.category.categoryCode}" - class="required" allowClear="true" canSelectRoot="true" canSelectParent="true" /> + class="required" allowClear="false" canSelectRoot="true" canSelectParent="false" />