From 5ecb954f03f2da90df620155cc98edf3b8184b3d Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 15:07:33 +0800
Subject: [PATCH] 修改bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java
index fe4a69a..ccb64d9 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/MenuServiceImpl.java
@@ -2,14 +2,20 @@
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.mapper.MenuMapper;
import com.dsh.course.model.node.MenuNode;
import com.dsh.course.model.node.ZTreeNode;
+import com.dsh.guns.config.UserExt;
+import com.dsh.guns.modular.system.model.Relation;
+import com.dsh.guns.modular.system.service.IRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.dsh.guns.modular.system.model.Menu;
@@ -64,9 +70,18 @@
return this.baseMapper.getMenuIdsByRoleId(roleId);
}
+
+ @Autowired
+ private IRelationService relationService;
@Override
public List<ZTreeNode> menuTreeList() {
- return this.baseMapper.menuTreeList();
+ List<ZTreeNode> zTreeNodes = this.baseMapper.menuTreeList();
+ if(UserExt.getUser().getObjectType()==3){
+ List<Relation> list = relationService.list(new LambdaQueryWrapper<Relation>().eq(Relation::getRoleid, 3));
+ List<Long> collect = list.stream().map(Relation::getMenuid).collect(Collectors.toList());
+ zTreeNodes= zTreeNodes.stream().filter(e -> collect.contains(e.getId())).collect(Collectors.toList());
+ }
+ return zTreeNodes;
}
@Override
--
Gitblit v1.7.1