From 2dfd3bbb1b4976f0702b1adede273ad6c6939436 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Mar 2021 09:59:57 +0800
Subject: [PATCH] 组菜单分配
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index d71bda7..2ee483f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -77,7 +77,7 @@
//������������
String password = parameters.get("password").toString();
//������������
- //password = AESUtils.decrypt(password, AESKey);
+ password = AESUtils.decrypt(password, AESKey);
if (!MD5Utils.saltMD5Verify(password, userBo.getPassword())) {
result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
@@ -114,7 +114,9 @@
userInfo.put("organizationName", organization.getName());
userInfo.put("locationLevel", organization.getLocationLevel());
userInfo.put("groups", groups);
- userInfo.putAll(getMenus(userBo.getId(), -1));
+ Map<String, Object> map = new HashMap<>();
+ map.put("userId",userBo.getId());
+ userInfo.putAll(getMenus(map));
try {
//������token������������redis
String token = TokenUtils.getToken(userBo.getId().toString(), userInfo);
@@ -130,13 +132,13 @@
return result;
}
- //������userId������������������������
- public Map<String, Object> getMenus(int userId, int orgId) {
+ @Override
+ public Map<String, Object> getMenus(Map<String, Object> parameters) {
List<Menu> allMenus;
- if (orgId == -1) {
- allMenus = menuMapper.selectUserMenu(userId);
+ if (parameters.containsKey("userId")) {
+ allMenus = menuMapper.selectUserMenu(Integer.parseInt(parameters.get("userId").toString()));
} else {
- allMenus = menuMapper.selectOrganizationMenu(orgId);
+ allMenus = menuMapper.selectOrganizationMenu(Integer.parseInt(parameters.get("orgId").toString()));
}
Map<String, Object> resultMap = new LinkedHashMap<>();
@@ -162,8 +164,7 @@
}
//������������������������������������
- public List<Map<String, Object>> getMenusByRecursion(Menu menu, List<Menu> menus) {
- List<List<Map<String, Object>>> resultList = new ArrayList();
+ private List<Map<String, Object>> getMenusByRecursion(Menu menu, List<Menu> menus) {
Menu newMenu = new Menu();
newMenu.setParentId(menu.getId());
//������������������������������
@@ -183,7 +184,6 @@
menuMap.put("menus", getMenusByRecursion(o, menus));
list.add(menuMap);
});
- resultList.add(list);
}
return list;
}
--
Gitblit v1.8.0