From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug

---
 server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java b/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java
index 2363d56..7948b7b 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java
@@ -158,6 +158,7 @@
                 nodeVO.setIndex("menu_" + menu.getId());
                 nodeVO.setLabel(menu.getName());
                 nodeVO.setUrl(menu.getPath());
+                nodeVO.setUrlSec(menu.getPathSec());
                 nodeVO.setIcon(menu.getIcon());
                 nodeVO.setChildren(new ArrayList<>());
                 rootNodes.add(nodeVO);
@@ -182,7 +183,7 @@
             if (menu == null) {
                 continue;
             }
-            if (menu.getFixed()) {
+            if (menu.getFixed() !=null && menu.getFixed()) {
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇峰嬁鍒犻櫎" + menu.getName() + ", 鍥犱负杩欐槸鍥哄畾鑿滃崟");
             }
         }
@@ -245,6 +246,7 @@
                 child.setId(menu.getId());
                 child.setLabel(menu.getName());
                 child.setUrl(menu.getPath());
+                child.setUrlSec(menu.getPathSec());
                 child.setIcon(menu.getIcon());
                 child.setIndex("menu_" + menu.getId());
                 child.setChildren(new ArrayList<>());

--
Gitblit v1.9.3