diff --git a/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java b/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java index 2eb9952..c1a067e 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java @@ -35,10 +35,13 @@ public class CacheController extends BaseController { @Resource private StringRedisTemplate stringRedisTemplate; - @PreAuthorize("hasAuthority('sys:cache:list')") @ApiOperation("查询全部缓存") @GetMapping() public ApiResult> list() { + final Integer tenantId = getTenantId(); + if(tenantId == null){ + return fail("请传tenantID",null); + } String key = "cache".concat(getTenantId().toString()).concat("*"); final Set keys = stringRedisTemplate.keys(key); final HashMap map = new HashMap<>(); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/DictController.java b/src/main/java/com/gxwebsoft/common/system/controller/DictController.java index daef449..6e0ff51 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/DictController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/DictController.java @@ -38,7 +38,6 @@ public class DictController extends BaseController { private DictDataService dictDataService; @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog @ApiOperation("分页查询字典") @GetMapping("/page") public ApiResult> page(DictParam param) { @@ -48,7 +47,6 @@ public class DictController extends BaseController { } @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog @ApiOperation("查询全部字典") @GetMapping() public ApiResult> list(DictParam param) { @@ -57,11 +55,12 @@ public class DictController extends BaseController { return success(dictService.list(page.getOrderWrapper())); } - @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog @ApiOperation("查询全部字典") @GetMapping("/tree") public ApiResult tree() { + if (getTenantId() == null) { + return fail("租户ID不存在"); + } final HashMap result = new HashMap<>(); final List dictData = dictDataService.listRel(new DictDataParam()); final Map> dataCollect = dictData.stream().collect(Collectors.groupingBy(DictData::getDictCode)); @@ -83,7 +82,6 @@ public class DictController extends BaseController { } @PreAuthorize("hasAuthority('sys:dict:list')") - @OperationLog @ApiOperation("根据id查询字典") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) {