zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
chenyanchang
2026-05-25 19:14:07 +08:00
parent a7c0361e5e
commit 5f3863f768
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@@ -163,13 +163,14 @@ public class SysLoginController
SysUser user = SecurityUtils.getLoginUser().getUser(); SysUser user = SecurityUtils.getLoginUser().getUser();
// 角色集合 // 角色集合
Set<String> roles = permissionService.getRolePermission(user); Set<String> roles = permissionService.getRolePermission(user);
// Set<SysRole> sysRole = permissionService.getSysRolePermission(user); List<SysRole> sysRole = permissionService.getSysRolePermission(user);
user.setRoles(sysRole);
// 权限集合 // 权限集合
Set<String> permissions = permissionService.getMenuPermission(user); Set<String> permissions = permissionService.getMenuPermission(user);
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("user", user); ajax.put("user", user);
ajax.put("roles", roles); ajax.put("roles", roles);
// ajax.put("sysRole", sysRole); ajax.put("sysRole", sysRole);
ajax.put("permissions", permissions); ajax.put("permissions", permissions);
return ajax; return ajax;
} }

19
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
View File

@@ -1,15 +1,17 @@
package com.ruoyi.framework.web.service; package com.ruoyi.framework.web.service;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* 用户权限处理 * 用户权限处理
@@ -52,14 +54,15 @@ public class SysPermissionService
* @param user 用户信息 * @param user 用户信息
* @return 角色权限信息 * @return 角色权限信息
*/ */
public Set<SysRole> getSysRolePermission(SysUser user) public List<SysRole> getSysRolePermission(SysUser user)
{ {
Set<SysRole> roles = new HashSet<SysRole>(); Set<SysRole> roles = new HashSet<SysRole>();
List<SysRole> roleList = roleService.selectRolesByUserId(user.getUserId()); List<SysRole> roleList = roleService.selectRolesByUserId(user.getUserId());
if (roleList != null && !roleList.isEmpty()) { if (roleList != null && !roleList.isEmpty()) {
roles.addAll(roleList); roles.addAll(roleList);
roleList = roles.stream().collect(Collectors.toList());;
} }
return roles; return roleList;
} }
/** /**