|
|
@@ -1,5 +1,6 @@
|
|
|
package com.macro.mall.controller;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import com.macro.mall.common.api.CommonPage;
|
|
|
import com.macro.mall.common.api.CommonResult;
|
|
|
import com.macro.mall.dto.UmsAdminLoginParam;
|
|
|
@@ -23,6 +24,7 @@ import java.security.Principal;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 后台用户管理
|
|
|
@@ -92,9 +94,13 @@ public class UmsAdminController {
|
|
|
UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
data.put("username", umsAdmin.getUsername());
|
|
|
- data.put("roles", new String[]{"TEST"});
|
|
|
data.put("menus", roleService.getMenuList(umsAdmin.getId()));
|
|
|
data.put("icon", umsAdmin.getIcon());
|
|
|
+ List<UmsRole> roleList = adminService.getRoleList(umsAdmin.getId());
|
|
|
+ if(CollUtil.isNotEmpty(roleList)){
|
|
|
+ List<String> roles = roleList.stream().map(UmsRole::getName).collect(Collectors.toList());
|
|
|
+ data.put("roles",roles);
|
|
|
+ }
|
|
|
return CommonResult.success(data);
|
|
|
}
|
|
|
|
macro