From e5a6400acac48337410a4623bbcf5f07d2adf879 Mon Sep 17 00:00:00 2001
From: yaoq <Yaoq@92827>
Date: Wed, 10 Aug 2022 18:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/bpm/web/sys/user/menu/MenuHandler.java  | 34 ++++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menu/MenuHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menu/MenuHandler.java
index dcf4ba3..c00eeb0 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menu/MenuHandler.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menu/MenuHandler.java
@@ -176,25 +176,27 @@ public class MenuHandler {
             if (PubUtil.isNotEmpty(mcList)) {
                 for (ModelCatalog mc : mcList) {
                     List<SwMap> children = buildTreeData(prj_id, mc.getId());
-                    if (PubUtil.isEmpty(children)) continue;
-                    MenuNode menuNode = new MenuNode();
-                    menuNode.setMenu(mc.getId());
-                    menuNode.setLabel(mc.getName());
-                    menuNode.setChildren(children);
-                    list.add(menuNode.getData());
+                    if (PubUtil.isNotEmpty(children)) {
+                        MenuNode menuNode = new MenuNode();
+                        menuNode.setMenu(mc.getId());
+                        menuNode.setLabel(mc.getName());
+                        menuNode.setChildren(children);
+                        list.add(menuNode.getData());
+                    }
+                    Set<Menu> menus = MenuCache.getInstance().getByM(String.valueOf(mc.getId()));
+                    if (PubUtil.isNotEmpty(menus)) {
+                        for (Menu m : menus) {
+                            MenuNode menu = new MenuNode();
+                            menu.setMenu(m.getId());
+                            menu.setLabel(m.getName());
+                            menu.setIcon(m.getIcon());
+                            menu.setSeq(m.getSeq());
+                            list.add(menu.getData());
+                        }
+                    }
                 }
                 return list;
             }
-            Set<Menu> menus = MenuCache.getInstance().getByM(String.valueOf(id));
-            if (PubUtil.isEmpty(menus)) return list;
-            for (Menu m : menus) {
-                MenuNode menuNode = new MenuNode();
-                menuNode.setMenu(m.getId());
-                menuNode.setLabel(m.getName());
-                menuNode.setIcon(m.getIcon());
-                menuNode.setSeq(m.getSeq());
-                list.add(menuNode.getData());
-            }
             return list;
         }