|
|
|
@ -37,6 +37,7 @@ import javax.annotation.Resource; |
|
|
|
|
import javax.annotation.security.PermitAll; |
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
|
import javax.validation.Valid; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Collections; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Set; |
|
|
|
@ -124,9 +125,12 @@ public class AuthController { |
|
|
|
|
|
|
|
|
|
// 1.3 获得菜单列表
|
|
|
|
|
Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId)); |
|
|
|
|
List<MenuDO> menuList = menuService.getMenuList(menuIds); |
|
|
|
|
menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单
|
|
|
|
|
List<MenuDO> menuList = new ArrayList<>(); |
|
|
|
|
if(menuIds.size() >0){ |
|
|
|
|
menuList = menuService.getMenuList(menuIds); |
|
|
|
|
menuList.removeIf(menu -> !CommonStatusEnum.ENABLE.getStatus().equals(menu.getStatus())); // 移除禁用的菜单
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
// 2. 拼接结果返回
|
|
|
|
|
return success(AuthConvert.INSTANCE.convert(user, roles, menuList)); |
|
|
|
|
} |
|
|
|
|