From a2a9e94745faff3f3dbc0c1bf697fb6e7418971c Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Thu, 29 Sep 2022 09:31:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9D=83=E9=99=90=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=97=AE=E9=A2=98=E3=80=81=E5=A4=B4=E5=83=8F=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/AuthorizationController.java | 2 +- .../modules/system/service/RoleService.java | 5 ++-- .../system/service/impl/RoleServiceImpl.java | 10 ++++---- nladmin-ui/src/layout/components/Navbar.vue | 24 +++++++++---------- nladmin-ui/src/views/system/dept/index.vue | 2 +- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java index 1f1bdef1f..9f24ffc2a 100644 --- a/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java +++ b/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java @@ -93,7 +93,7 @@ public class AuthorizationController { } // 获取权限列表 - 登录查找权限 - List permissionList = roleService.getPermissionList(userDto.getId().toString()); + List permissionList = roleService.getPermissionList(userDto); // 保存用户信息到session - 登录输入，登出删除 CurrentUser user = new CurrentUser(); diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/RoleService.java b/nladmin-system/src/main/java/org/nl/modules/system/service/RoleService.java index 80f31a998..9779b4694 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/RoleService.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/RoleService.java @@ -19,6 +19,7 @@ import org.nl.modules.system.domain.Role; import org.nl.modules.system.service.dto.RoleDto; import org.nl.modules.system.service.dto.RoleQueryCriteria; import org.nl.modules.system.service.dto.RoleSmallDto; +import org.nl.modules.system.service.dto.UserDto; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; @@ -122,10 +123,10 @@ public interface RoleService { /** * 通过id获取用户的权限 - * @param id + * @param userDto * @return */ - List getPermissionList(String id); + List getPermissionList(UserDto userDto); /** * 验证是否被用户关联 diff --git a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java index 7a9613236..93d21e1a0 100644 --- a/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java @@ -15,7 +15,6 @@ */ package org.nl.modules.system.service.impl; -import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -162,17 +161,16 @@ public class RoleServiceImpl implements RoleService { } @Override - @Cacheable(key = "'auth:' + #p0") - public List getPermissionList(String id) { + @Cacheable(key = "'auth:' + #p0.id") + public List getPermissionList(UserDto userDto) { List permission = new LinkedList<>(); // 查看是否为管理员 - UserDto user = (UserDto) StpUtil.getSession().get("UserDto"); - if (user.getIsAdmin()) { // 是管理员 + if (userDto.getIsAdmin()) { // 是管理员 permission.add("admin"); } HashMap map = new HashMap<>(); map.put("flag", "1"); - map.put("user_id", id); + map.put("user_id", userDto.getId().toString()); JSONArray rows = WQL.getWO("SYS_MENU").addParamMap(map).process().getResultJSONArray(0); for (int i = 0; i < rows.size(); i++) { JSONObject jsonObject = rows.getJSONObject(i); diff --git a/nladmin-ui/src/layout/components/Navbar.vue b/nladmin-ui/src/layout/components/Navbar.vue index 78b095268..a3347ee18 100644 --- a/nladmin-ui/src/layout/components/Navbar.vue +++ b/nladmin-ui/src/layout/components/Navbar.vue @@ -21,11 +21,11 @@ --> - +
- - {{ user.nickName }} + + {{ user.nickName }}
@@ -184,22 +184,22 @@ export default { } } } + .user-avatar { + cursor: pointer; + width: 40px; + height: 40px; + border-radius: 10px; + } .avatar-container { - margin-right: 10px; + //margin-right: 10px; .avatar-wrapper { - margin-top: 5px; + //margin-top: 5px; position: relative; - - .user-avatar { - cursor: pointer; - width: 40px; - height: 40px; - border-radius: 10px; - } .user-nickname { cursor: pointer; font-size: 18px; + margin-left: -10px; } } } diff --git a/nladmin-ui/src/views/system/dept/index.vue b/nladmin-ui/src/views/system/dept/index.vue index 4d5696c13..e5c87df31 100644 --- a/nladmin-ui/src/views/system/dept/index.vue +++ b/nladmin-ui/src/views/system/dept/index.vue @@ -99,7 +99,7 @@ @selection-change="crud.selectionChangeHandler" > - +