From 62fdbdb8371cb2572d6fb0ca02cd11bdf8ac8098 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Fri, 07 Jun 2024 18:08:49 +0800
Subject: [PATCH] 无权限异常处理
---
blade-auth/src/main/java/org/springblade/system/controller/TenantController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/blade-auth/src/main/java/org/springblade/system/controller/TenantController.java b/blade-auth/src/main/java/org/springblade/system/controller/TenantController.java
index f94cca2..60fb624 100644
--- a/blade-auth/src/main/java/org/springblade/system/controller/TenantController.java
+++ b/blade-auth/src/main/java/org/springblade/system/controller/TenantController.java
@@ -26,6 +26,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
@@ -47,8 +48,8 @@
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.tenant.constant.TenantBaseConstant.TENANT_DATASOURCE_CACHE;
import static org.springblade.core.tenant.constant.TenantBaseConstant.TENANT_DATASOURCE_EXIST_KEY;
-import static org.springblade.system.cache.SysCache.TENANT_PACKAGE_ID;
-import static org.springblade.system.cache.SysCache.TENANT_TENANT_ID;
+import static org.springblade.common.cache.SysCache.TENANT_PACKAGE_ID;
+import static org.springblade.common.cache.SysCache.TENANT_TENANT_ID;
/**
* 控制器
@@ -59,7 +60,7 @@
@ApiIgnore
@RestController
@AllArgsConstructor
-@RequestMapping("/tenant")
+@RequestMapping("/blade-system/tenant")
@Api(value = "租户管理", tags = "接口")
public class TenantController {
@@ -105,6 +106,8 @@
@ApiOperation(value = "下拉数据源", notes = "传入tenant")
// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) {
+ String tenantId = AuthUtil.getTenantId();
+ bladeUser.setTenantId(tenantId);
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
return R.data(list);
--
Gitblit v1.9.3