From f0e49fd03b4e5bae06086bf361e7295dc523646d Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 21 Dec 2020 21:08:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90resource=E3=80=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8E=A5=E5=8F=A3=E6=A0=91=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysResourceServiceImpl.java  | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

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<SysResourceMapper, SysRe
         // 2. 按应用和模块编码设置map
         Map<String, Map<String, List<ResourceTreeNode>>> appModularResources = divideResources(allResource);
 
-        // 3. 根据map组装资源树
-        return createResourceTree(appModularResources);
+        // 3. 创建模块code和模块name的映射
+        Map<String, String> modularCodeName = createModularCodeName(allResource);
+
+        // 4. 根据map组装资源树
+        return createResourceTree(appModularResources, modularCodeName);
     }
 
     @Override
@@ -275,13 +278,27 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
         return appModularResources;
     }
 
+    /**
+     * 创建模块code和name的映射
+     *
+     * @author fengshuonan
+     * @date 2020/12/21 11:23
+     */
+    private Map<String, String> createModularCodeName(List<SysResource> resources) {
+        HashMap<String, String> 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<ResourceTreeNode> createResourceTree(Map<String, Map<String, List<ResourceTreeNode>>> appModularResources) {
+    private List<ResourceTreeNode> createResourceTree(Map<String, Map<String, List<ResourceTreeNode>>> appModularResources, Map<String, String> modularCodeName) {
 
         List<ResourceTreeNode> finalTree = new ArrayList<>();
 
@@ -300,13 +317,13 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
 
             // 创建模块节点
             ArrayList<ResourceTreeNode> 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);
             }