From cd46a066e91c2b1b1de4ad630ffaaa695a311465 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 26 May 2023 21:08:03 +0800
Subject: [PATCH] 新增业务字典查询接口，可以根据code 和 parentId 查询字典信息
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java
index 689b7e7..557ee51 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java
@@ -71,6 +71,10 @@
if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
parentId = null;
}
+ // 如果不是超级管理员
+ if (!AuthUtil.isAdministrator()){
+ param.put("super",1);
+ }
return baseMapper.lazyList(parentId, param);
}
@@ -146,7 +150,12 @@
@Override
public List<TreeNode> grantTree(BladeUser user) {
- List<TreeNode> menuTree = user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantTree() : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));
+ Map<String, Object> param = new HashMap<>(1);
+ // 如果不是超级管理员
+ if(!AuthUtil.isAdministrator()){
+ return ForestNodeMerger.merge(tenantPackageTree(baseMapper.grantTreeNew(), user.getTenantId()));
+ }
+ List<TreeNode> menuTree = user.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? baseMapper.grantTree(param) : baseMapper.grantTreeByRole(Func.toLongList(user.getRoleId()));
return ForestNodeMerger.merge(tenantPackageTree(menuTree, user.getTenantId()));
}
@@ -319,6 +328,11 @@
}
+ @Override
+ public List<MenuVO> getButtonList(String roleId) {
+ return baseMapper.getButtonList(Func.toLongList(roleId));
+ }
+
public WebMenuVO buildWebMenuVO(MenuVO menuVO){
WebMenuVO webMenuVO = new WebMenuVO();
--
Gitblit v1.9.3