From ec7bdc6eb25e45f9e84b99ab8a4ead05027b316a Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Wed, 05 Jun 2024 21:16:11 +0800
Subject: [PATCH] 用户，租户，角色查询修改
---
blade-auth/src/main/java/org/springblade/system/controller/RoleController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/blade-auth/src/main/java/org/springblade/system/controller/RoleController.java b/blade-auth/src/main/java/org/springblade/system/controller/RoleController.java
index eee03f6..6de475d 100644
--- a/blade-auth/src/main/java/org/springblade/system/controller/RoleController.java
+++ b/blade-auth/src/main/java/org/springblade/system/controller/RoleController.java
@@ -7,6 +7,7 @@
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
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;
@@ -37,7 +38,7 @@
@NonDS
@RestController
@AllArgsConstructor
-@RequestMapping("/role")
+@RequestMapping("/blade-system/role")
@Api(value = "角色", tags = "角色")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public class RoleController {
@@ -66,6 +67,8 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "列表", notes = "传入role")
public R<List<RoleVO>> list(@ApiIgnore @RequestParam Map<String, Object> role, BladeUser bladeUser) {
+ String tenantId = AuthUtil.getTenantId();
+ bladeUser.setTenantId(tenantId);
QueryWrapper<Role> queryWrapper = Condition.getQueryWrapper(role, Role.class);
List<Role> list = roleService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()) : queryWrapper);
return R.data(RoleWrapper.build().listNodeVO(list));
--
Gitblit v1.9.3