From 52bff43f88f84a9eaf5ca6d4037d80d918aa80e7 Mon Sep 17 00:00:00 2001
From: FLYPHT <1035748121@qq.com>
Date: Sat, 6 Aug 2022 18:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A0=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/bpm/web/design/preview/PreviewMenuTreeService.java    | 4 +++-
 .../smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java
index 1ca781f..786b90c 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java
@@ -76,7 +76,9 @@ public class PreviewMenuTreeService {
 
     public List<MenuVO> buildMenu(String prj_id, String module, UserSession us) {
         Set<MenuPlan> set = MenuPlanCache.getInstance().getByP(prj_id);
-        if (PubUtil.isEmpty(set)) new ArrayList<>();
+        if (PubUtil.isEmpty(set)) {
+            return new ArrayList<>();
+        }
         MenuPlan menuPlan = set.iterator().next();
         MenuPlanContent mpc = new MenuPlanContent(menuPlan.getContent());
         List<MenuVO> list = new ArrayList<>();
diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java
index 1954fab..67db28d 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanContent.java
@@ -131,8 +131,13 @@ public class MenuPlanContent {
             if (item.getId() == id) {
                 return item;
             }
-            if (PubUtil.isNotEmpty(item.getChildren())) {
-                return findById(id, item.getChildren());
+        }
+        for (MenuPlanItem item : itemList) {
+            if(PubUtil.isNotEmpty(item.getChildren())){
+                MenuPlanItem rt = findById(id,item.getChildren());
+                if(rt!=null){
+                    return rt;
+                }
             }
         }
         return null;