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/controller/MenuController.java | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java | 3 +--
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 4 +---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/MenuController.java b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
index 94c4f07..10d52e6 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MenuController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MenuController.java
@@ -45,7 +45,7 @@
@RequestMapping(value = "allotMenus", method = RequestMethod.POST)
public ResultMessage allotMenus(HttpServletRequest request) {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
- if (!parameters.containsKey("userId")) {
+ if (!parameters.containsKey("groupId")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
String token = request.getHeader("token");
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
index 5375285..651b199 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.moral.api.entity.GroupMenu;
-import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.GroupMenuMapper;
import com.moral.api.service.GroupMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,6 +46,7 @@
groupMenu.setMenuId(menuId);
groupMenu.setChannel(Constants.WEB_CHANNEL);
groupMenu.setOrganizationId((Integer) currentUserInfo.get("organizationId"));
+ groupMenuMapper.insert(groupMenu);
}
}
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
index 8d35511..f05735c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
@@ -30,7 +30,6 @@
public Map<String, Object> selectMenusByOrgId(Integer orgId) {
Map<String, Object> map = new HashMap<>();
map.put("orgId",orgId);
- Map<String, Object> menus = userService.getMenus(map);
- return menus;
+ return userService.getMenus(map);
}
}
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