diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java index b2b13d85a..8cd633197 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java @@ -92,8 +92,11 @@ public class SysResourceServiceImpl extends ServiceImpl>> appModularResources = divideResources(allResource); - // 3. 根据map组装资源树 - return createResourceTree(appModularResources); + // 3. 创建模块code和模块name的映射 + Map modularCodeName = createModularCodeName(allResource); + + // 4. 根据map组装资源树 + return createResourceTree(appModularResources, modularCodeName); } @Override @@ -275,13 +278,27 @@ public class SysResourceServiceImpl extends ServiceImpl createModularCodeName(List resources) { + HashMap modularCodeName = new HashMap<>(); + for (SysResource resource : resources) { + modularCodeName.put(resource.getModularCode(), resource.getModularName()); + } + return modularCodeName; + } + /** * 根据归好类的资源,创建资源树 * * @author fengshuonan * @date 2020/12/18 15:45 */ - private List createResourceTree(Map>> appModularResources) { + private List createResourceTree(Map>> appModularResources, Map modularCodeName) { List finalTree = new ArrayList<>(); @@ -300,13 +317,13 @@ public class SysResourceServiceImpl extends ServiceImpl modularNodes = new ArrayList<>(); - for (String modularName : modularResources.keySet()) { + for (String modularCode : modularResources.keySet()) { ResourceTreeNode modularNode = new ResourceTreeNode(); - modularNode.setCode(modularName); - modularNode.setNodeName(modularName); + modularNode.setCode(modularCode); + modularNode.setNodeName(modularCodeName.get(modularCode)); modularNode.setResourceFlag(false); modularNode.setParentCode(appName); - modularNode.setChildren(modularResources.get(modularName)); + modularNode.setChildren(modularResources.get(modularCode)); modularNodes.add(modularNode); }