Commit fef5d4ee by guojuxing

权限集修复

parent d32a1c40
......@@ -58,11 +58,11 @@ public class RoleController {
ServiceResponse<List<MenuDTO>> gicResult = menuApiService
.listMenuTreeForRole(MenuProjectConstants.DEFAULT_PROJECT);
Map<Integer, Object> gicMap = new HashMap<>(16);
Map<String, Object> gicMap = new HashMap<>(16);
if (gicResult.isSuccess()) {
List<MenuDTO> gicMenuList = gicResult.getResult();
for (MenuDTO menuDTO : gicMenuList) {
gicMap.put(menuDTO.getMenuId(), 1);
gicMap.put(menuDTO.getMenuId().toString(), 1);
}
}
vo.setGicMap(changeListToSelectTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, menuListResult.getResult(),
......@@ -183,7 +183,7 @@ public class RoleController {
}
public static List<Map<String, Object>> changeListToSelectTree(int storeGroupId, List<MenuDTO> list,
Map<Integer, Object> menuIdMap) {
Map<String, Object> menuIdMap) {
List<Map<String, Object>> result = new ArrayList<>();
if (list != null) {
for (MenuDTO menuDTO : list) {
......@@ -193,7 +193,7 @@ public class RoleController {
data.put("menuName", menuDTO.getMenuName());
data.put("project", menuDTO.getProject());
data.put("menuType", menuDTO.getMenuType());
if (menuIdMap.containsKey(menuDTO.getMenuId())) {
if (menuIdMap.containsKey(menuDTO.getMenuId().intValue())) {
//如果存在,则说明钩上了
data.put("isSelect", true);
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment