From 4644fe91ce7aa8a38486946df0aee1fa668000fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 5 Mar 2025 17:45:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=99=90=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/system/controller/CacheController.java | 5 ++++- .../common/system/controller/DictController.java | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) 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) {