From 477c18f08b2918f24f56d4e082146cdd35b0264c Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 06 Jun 2024 12:01:50 +0800
Subject: [PATCH] 错误引入信息清除
---
blade-auth/src/main/java/org/springblade/system/controller/RoleController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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..7c269be 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,17 +7,19 @@
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;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
-import org.springblade.system.cache.SysCache;
+import org.springblade.common.cache.SysCache;
import org.springblade.system.entity.Role;
import org.springblade.system.service.IRoleService;
import org.springblade.system.user.cache.UserCache;
import org.springblade.system.user.entity.User;
import org.springblade.system.vo.GrantVO;
+import org.springblade.system.vo.RoleParam;
import org.springblade.system.vo.RoleVO;
import org.springblade.system.wrapper.RoleWrapper;
import org.springframework.web.bind.annotation.*;
@@ -37,7 +39,7 @@
@NonDS
@RestController
@AllArgsConstructor
-@RequestMapping("/role")
+@RequestMapping("/blade-system/role")
@Api(value = "角色", tags = "角色")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public class RoleController {
@@ -66,6 +68,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));
@@ -148,4 +152,15 @@
return R.data(list);
}
+ /**
+ * 自定义列表（只获取当前角色下级角色）
+ * @param roleParam
+ * @return
+ */
+ @GetMapping("/getRoleList")
+ public R<List<RoleVO>> getRoleList(RoleParam roleParam) {
+ List<Role> list = roleService.getRoleList(roleParam);
+ return R.data(RoleWrapper.build().listNodeVO(list));
+ }
+
}
--
Gitblit v1.9.3