From 18562f71a368fcf3909f429d58665009b757f8ba Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 22 Mar 2022 14:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/controller/SysDictController.java | 7 ++++--- .../modules/system/controller/SysDictItemController.java | 4 ++-- .../jero/modules/system/mapper/xml/SysCategoryMapper.xml | 2 +- .../system/service/impl/SysCategoryServiceImpl.java | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 8b741bf7b..45eebf61a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -31,6 +31,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecgframework.poi.excel.ExcelImportCheckUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -379,7 +380,7 @@ public class SysDictController { @ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典") @RequiresRoles({"admin"}) @RequestMapping(value = "/add", method = RequestMethod.POST) - //@RequiresPermissions("dict:add") + @RequiresPermissions("dict:add") public Result add(@RequestBody SysDict sysDict) { Result result = new Result(); try { @@ -420,7 +421,7 @@ public class SysDictController { @ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典") @RequiresRoles({"admin"}) @RequestMapping(value = "/edit", method = RequestMethod.PUT) - //@RequiresPermissions("dict:edit") + @RequiresPermissions("dict:edit") public Result edit(@RequestBody SysDict sysDict) { Result result = new Result(); SysDict sysdict = sysDictService.getById(sysDict.getId()); @@ -481,7 +482,7 @@ public class SysDictController { @RequiresRoles({"admin"}) @GetMapping(value = "/logicDelete") @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) - //@RequiresPermissions("dict:logicDelete") + @RequiresPermissions("dict:logicDelete") public Result logicDelete(@RequestParam(name="id",required=true) String id) { Result result = new Result(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 80bf2c2a8..60fc7f36b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -152,7 +152,7 @@ public class SysDictItemController { * @return */ //@RequiresRoles({"admin"}) - //@RequiresPermissions("dict:logicDelete") + @RequiresPermissions("dictItem:logicDelete") @RequestMapping(value = "/logicDelete", method = RequestMethod.GET) @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result logicDelete(@RequestParam(name="id",required=true) String id) { @@ -210,7 +210,7 @@ public class SysDictItemController { * @return */ //@RequiresRoles({"admin"}) - //@RequiresPermissions("dict:logicDeleteBatch") + @RequiresPermissions("dictItem:logicDeleteBatch") @RequestMapping(value = "/logicDeleteBatch", method = RequestMethod.GET) @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml index 2c5450203..272dbffd7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml @@ -21,7 +21,7 @@ select create_by,create_time,sys_org_code,update_by,update_time,attribute_type,code, del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id from sys_category - where is_tag_dict=1 and sys_dict_id=#{params.sys_dict_id} + where is_tag_dict=1 and sys_dict_id=#{params.sysDictId} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 5c0d6466b..74b15f6fe 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -65,6 +65,7 @@ public class SysCategoryServiceImpl extends ServiceImpl