From c22b5eb143260a98b9aab8fc3281ffa2a5ca2eed Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 28 十月 2022 18:07:42 +0800
Subject: [PATCH] 修改
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
index d610315..68dde62 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
@@ -5,16 +5,15 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dto.UmsMenuNode;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.user.*;
import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.mapper.user.UmsMenuMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
-import com.ycl.service.user.UmsAdminCacheService;
-import com.ycl.service.user.UmsRoleMenuRelationService;
-import com.ycl.service.user.UmsRoleResourceRelationService;
-import com.ycl.service.user.UmsRoleService;
+import com.ycl.service.user.*;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,6 +35,13 @@
private UmsRoleMenuRelationService roleMenuRelationService;
@Autowired
private UmsRoleResourceRelationService roleResourceRelationService;
+
+ private UmsMenuService umsMenuService;
+ @Autowired
+ public void setUmsMenuService(UmsMenuService umsMenuService) {
+ this.umsMenuService = umsMenuService;
+ }
+
@Resource
private UmsMenuMapper umsMenuMapper;
@Resource
@@ -83,10 +89,15 @@
}
@Override
- public List<UmsMenu> getMenuList(Long adminId) {
- return umsMenuMapper.getMenuList(adminId);
+ public List<UmsMenuNode> getMenuList(Long adminId) {
+ List<UmsMenu> menuList = umsMenuMapper.getMenuList(adminId);
+ List<UmsMenuNode> result = menuList.stream()
+ .filter(menu -> menu.getParentId().equals(0L))
+ .map(menu -> umsMenuService.covertMenuNode(menu, menuList)).collect(Collectors.toList());
+ return result;
}
+
@Override
public List<UmsMenu> listMenu(Long roleId) {
return umsMenuMapper.getMenuListByRoleId(roleId);
--
Gitblit v1.8.0