From 2837bdd57f72e386bbf9a725e7b3a13e5eb9e930 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 09:19:57 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 55925d2..c506031 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java
@@ -113,7 +113,8 @@
String rPath =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.MENU_IMG).getCode();
for (SystemMenu menu : menus) {
if(Constants.equalsInteger(menu.getType(),Constants.PlatType.companyH5) && StringUtils.isNotBlank(menu.getIcon())){
- menu.setIcon(rPath+menu.getIcon());
+ menu.setIcon(menu.getIcon());
+ menu.setResourcePath(rPath);
}
if (menu.getParentId() == null) {
SystemMenuListVO rootMenu = new SystemMenuListVO();
@@ -125,7 +126,8 @@
menus.removeIf(menu -> menu.getParentId() == null);
for (SystemMenuListVO child : rootMenus) {
if(Constants.equalsInteger(child.getType(),Constants.PlatType.companyH5) && StringUtils.isNotBlank(child.getIcon())){
- child.setIcon(rPath+child.getIcon());
+ child.setIcon(child.getIcon());
+ child.setResourcePath(rPath);
}
this.fillChildren(child, menus);
}
@@ -180,7 +182,7 @@
if (menu == null) {
continue;
}
- if (menu.getFixed()) {
+ if (menu.getFixed() !=null && menu.getFixed()) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇峰嬁鍒犻櫎" + menu.getName() + ", 鍥犱负杩欐槸鍥哄畾鑿滃崟");
}
}
--
Gitblit v1.9.3