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 | 4 +---
1 files changed, 1 insertions(+), 3 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 100245f..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());
@@ -165,7 +165,6 @@
//������������������������������������
private List<Map<String, Object>> getMenusByRecursion(Menu menu, List<Menu> menus) {
- List<List<Map<String, Object>>> resultList = new ArrayList();
Menu newMenu = new Menu();
newMenu.setParentId(menu.getId());
//������������������������������
@@ -185,7 +184,6 @@
menuMap.put("menus", getMenusByRecursion(o, menus));
list.add(menuMap);
});
- resultList.add(list);
}
return list;
}
--
Gitblit v1.8.0