From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 a95c292..ddf91db 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,12 +58,12 @@
}
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"))));
- System.out.println("+++++++++++++++++++++++++++++++++++++++++++++");
- System.out.println(role);
- System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
data.put("role",role);
return data;
}
@@ -94,10 +94,16 @@
}
@Override
- public List<Map<String, Object>> getUserNameAndId() {
+ 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);
+ }
+
+ @Override
+ public RoleAndMenuDto getUserRoleInfo(String token) {
+ return null;
}
@Override
@@ -145,6 +151,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