From 0954638b3aa7edb90ea771a24ecfb5b83c203483 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 27 Feb 2023 12:28:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=8F=AA=E7=BB=99=E7=94=A8=E6=88=B7?= =?UTF-8?q?=20=E5=86=85=E5=AE=B9=E5=8F=91=E5=B8=83=20=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=97=B6=EF=BC=8C=E6=A0=8F=E7=9B=AE=E6=A0=91?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90=E5=8A=A0=E8=BD=BD=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/cms/web/CategoryController.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 badf6188..8c821c43 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 @@ -4,20 +4,6 @@ */ package com.jeesite.modules.cms.web; -import java.io.IOException; -import java.util.List; -import java.util.Map; - -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - import com.jeesite.common.collect.ListUtils; import com.jeesite.common.collect.MapUtils; import com.jeesite.common.config.Global; @@ -33,6 +19,20 @@ import com.jeesite.modules.cms.utils.CmsUtils; import com.jeesite.modules.sys.entity.Office; import com.jeesite.modules.sys.utils.DictUtils; import com.jeesite.modules.sys.utils.UserUtils; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.io.IOException; +import java.util.List; +import java.util.Map; /** * 栏目表Controller @@ -252,7 +252,7 @@ public class CategoryController extends BaseController { * @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示） * @return */ - @RequiresPermissions("cms:category:view") + @RequiresPermissions(value = {"cms:category:view", "cms:article:view"}, logical = Logical.OR) @RequestMapping(value = "treeData") @ResponseBody public List> treeData(String siteCode, String module, String excludeCode, Boolean isAll, String isShowCode) {