From c8638bb17163cc95e9063c358eb92cada1474102 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 12 六月 2023 09:00:05 +0800
Subject: [PATCH] 用户端代码
---
src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
index 11fb3a9..ec1fb8d 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
@@ -15,6 +15,7 @@
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.IRoleService;
+import com.stylefeng.guns.modular.system.service.ITUserService;
import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.service.SysOperationService;
import com.stylefeng.guns.modular.system.utils.tips.SuccessTip;
@@ -53,6 +54,9 @@
@Autowired
private SysOperationService sysOperation;
+
+ @Autowired
+ private ITUserService itUserService;
@@ -217,13 +221,12 @@
@GetMapping("/getAuthority")
@ResponseBody
public Object getAuthority(Integer userId) {
- User user = userService.selectById(userId);
+ TUser user = itUserService.selectById(userId);
if(user==null){
throw new GunsException(BizExceptionEnum.NO_THIS_USER);
}
- String roleid = user.getRoleid();
// 当前拥有的
- List<Relation> relations = roleService.selectAuthority(roleid);
+ List<Relation> relations = roleService.selectAuthority(String.valueOf(userId));
List<Menu> menuList = roleService.getRelation1(relations.stream().map(Relation::getMenuid).collect(Collectors.toList()));
List<Menu> parent = menuList.stream().filter(role -> role.getPcode().equals("0")).collect(Collectors.toList());
getChildren(parent,menuList);
@@ -247,7 +250,7 @@
@ApiOperation(value = "根据角色id获取权限信息",notes="根据角色id获取权限信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(name = "roleId", value = "角色Id", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "roleId", value = "用户Id", required = true, dataType = "int"),
})
@GetMapping("/getAuthorityFromRole")
@ResponseBody
--
Gitblit v1.7.1