From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 65 ++++++++++----------------------
1 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 643d304..9c3bfeb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -1,15 +1,16 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.lang.tree.Tree;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.TreeBuildUtils;
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
@@ -21,7 +22,6 @@
import org.springframework.stereotype.Service;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 鑿滃崟 涓氬姟灞傚鐞�
@@ -60,11 +60,11 @@
// 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭�
if (SysUser.isAdmin(userId)) {
menuList = list(new LambdaQueryWrapper<SysMenu>()
- .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
- .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
- .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
- .orderByAsc(SysMenu::getParentId)
- .orderByAsc(SysMenu::getOrderNum));
+ .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
+ .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
+ .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+ .orderByAsc(SysMenu::getParentId)
+ .orderByAsc(SysMenu::getOrderNum));
} else {
menu.getParams().put("userId", userId);
menuList = baseMapper.selectMenuListByUserId(menu);
@@ -114,7 +114,7 @@
* @return 閫変腑鑿滃崟鍒楄〃
*/
@Override
- public List<Integer> selectMenuListByRoleId(Long roleId) {
+ public List<Long> selectMenuListByRoleId(Long roleId) {
SysRole role = roleMapper.selectById(roleId);
return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
}
@@ -171,41 +171,18 @@
}
/**
- * 鏋勫缓鍓嶇鎵�闇�瑕佹爲缁撴瀯
- *
- * @param menus 鑿滃崟鍒楄〃
- * @return 鏍戠粨鏋勫垪琛�
- */
- @Override
- public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
- List<SysMenu> returnList = new ArrayList<SysMenu>();
- List<Long> tempList = new ArrayList<Long>();
- for (SysMenu dept : menus) {
- tempList.add(dept.getMenuId());
- }
- for (SysMenu menu : menus) {
- // 濡傛灉鏄《绾ц妭鐐�, 閬嶅巻璇ョ埗鑺傜偣鐨勬墍鏈夊瓙鑺傜偣
- if (!tempList.contains(menu.getParentId())) {
- recursionFn(menus, menu);
- returnList.add(menu);
- }
- }
- if (returnList.isEmpty()) {
- returnList = menus;
- }
- return returnList;
- }
-
- /**
* 鏋勫缓鍓嶇鎵�闇�瑕佷笅鎷夋爲缁撴瀯
*
* @param menus 鑿滃崟鍒楄〃
* @return 涓嬫媺鏍戠粨鏋勫垪琛�
*/
@Override
- public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus) {
- List<SysMenu> menuTrees = buildMenuTree(menus);
- return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+ public List<Tree<Long>> buildMenuTreeSelect(List<SysMenu> menus) {
+ return TreeBuildUtils.build(menus, (menu, tree) ->
+ tree.setId(menu.getMenuId())
+ .setParentId(menu.getParentId())
+ .setName(menu.getMenuName())
+ .setWeight(menu.getOrderNum()));
}
/**
@@ -285,11 +262,11 @@
@Override
public String checkMenuNameUnique(SysMenu menu) {
Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
- SysMenu info = getOne(new LambdaQueryWrapper<SysMenu>()
- .eq(SysMenu::getMenuName, menu.getMenuName())
- .eq(SysMenu::getParentId, menu.getParentId())
- .last("limit 1"));
- if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
+ long count = count(new LambdaQueryWrapper<SysMenu>()
+ .eq(SysMenu::getMenuName, menu.getMenuName())
+ .eq(SysMenu::getParentId, menu.getParentId())
+ .ne(SysMenu::getMenuId, menuId));
+ if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -324,7 +301,7 @@
}
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
- && UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
+ && UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
routerPath = "/" + menu.getPath();
}
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓鸿彍鍗曪級
@@ -360,7 +337,7 @@
*/
public boolean isMenuFrame(SysMenu menu) {
return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
- && menu.getIsFrame().equals(UserConstants.NO_FRAME);
+ && menu.getIsFrame().equals(UserConstants.NO_FRAME);
}
/**
--
Gitblit v1.9.3