From 2b7bb59d1255c3027257bc5ba76d4b14c4a24463 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sun, 14 Mar 2021 22:07:45 +0800
Subject: [PATCH] !49 修复Byte[]类型参数死循环的问题 Merge pull request !49 from 周艺峰/master
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 6a2c127..74c7451 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -11,8 +11,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.utils.SecurityUtils;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.SysMenu;
@@ -364,6 +364,10 @@
{
component = menu.getComponent();
}
+ else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu))
+ {
+ component = UserConstants.PARENT_VIEW;
+ }
return component;
}
@@ -380,6 +384,17 @@
}
/**
+ * 是否为parent_view组件
+ *
+ * @param menu 菜单信息
+ * @return 结果
+ */
+ public boolean isParentView(SysMenu menu)
+ {
+ return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
+ }
+
+ /**
* 根据父节点的ID获取所有子节点
*
* @param list 分类表
--
Gitblit v1.9.3