From 75ef59813ad1f15293d8e3937c3b8b85ca561703 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期一, 17 一月 2022 18:52:19 +0800
Subject: [PATCH] token优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index d076174..945dc01 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -105,10 +105,13 @@
Long userId = SecurityUtils.getUserId();
Admin admin = adminService.getById(userId);
List<Role> roles = roleService.listByAdminId(admin.getId());
+ if(CollectionUtil.isEmpty(roles)){
+ return ResponseUtil.fail("鐢ㄦ埛娌℃湁瑙掕壊锛屾棤娉曡幏鍙栨暟鎹�");
+ }
List<Menu> menus = menuService.listByRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
- MapBuilder<Object, Object> builder = MapUtil.builder().put("info", admin);
+ MapBuilder<Object, Object> builder = MapUtil.builder().put("admin", admin);
if (CollectionUtil.isNotEmpty(menus)) {
- List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0).collect(Collectors.toList());
+ List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0 || menu.getType() == 1).collect(Collectors.toList());
builder.put("menus", collect);
}
return ResponseUtil.success(builder.build());
--
Gitblit v1.9.3