From 2bdecf28a44019b125fe8e62a8ee4ea114418eea Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 14:09:15 +0800
Subject: [PATCH] 权限修改4.0
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 9ec7650..75791a6 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -58,9 +58,11 @@
}
Map<String, Object> data = new HashMap<>();
data.put("name",loginUser.get("name"));
+ data.put("account", loginUser.get("account"));
data.put("id",loginUser.get("id"));
data.put("roleId",loginUser.get("roleId"));
data.put("remind", remind);
+ data.put("sessionLayerId",loginUser.get("sessionLayerId"));
RoleAndMenuDto role = getRoleInfo(Long.valueOf(String.valueOf(loginUser.get("roleId"))));
data.put("role",role);
return data;
@@ -94,7 +96,7 @@
@Override
public List<Map<String, Object>> getUserNameAndId() {
LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(User::getId, User::getName);
+ wrapper.select(User::getId, User::getName).eq(User::getType,1);
return userMapper.selectMaps(wrapper);
}
@@ -148,6 +150,9 @@
public RoleAndMenuDto getRoleInfo(Long roleId) {
+ if(roleId==0){
+ return null;
+ }
RoleAndMenuDto roleAndMenuDto = roleManageMapper.selectAllRoleAndMenuByRoleId(roleId);
List<RoleMenu> collect = roleAndMenuDto.getRoleMenuList()
.stream()
--
Gitblit v1.9.3