From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
index 0089867..1f9e5ef 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
@@ -72,6 +72,8 @@
List<SystemMenu> menuPool;
if (currentMenu.getParentId() == null) {
menuPool = systemMenuService.findRootList();
+ //2024骞�11鏈�16鏃�13:51:53 杩囨护鍚岀被鍨嬫暟鎹�
+ menuPool = menuPool.stream().filter(i->Constants.equalsInteger(i.getType(),currentMenu.getType())).collect(Collectors.toList());
} else {
SystemMenu queryDto = new SystemMenu();
queryDto.setParentId(currentMenu.getParentId());
@@ -144,11 +146,14 @@
if(Objects.isNull(company)){
return rootNodes;
}
- SystemUser systemUser = systemUserService.findById(userId);
+ SystemUser dbUser = new SystemUser();
+ dbUser.setId(loginUserInfo.getId());
+ SystemUser systemUser = systemUserService.findOne(dbUser);
if(Objects.isNull(systemUser)){
return rootNodes;
}
- if(company.getUsername().equals(systemUser.getUsername())){
+ if(company.getUsername().equals(systemUser.getUsername())
+ || (Constants.equalsInteger(type,Constants.ONE) && !Constants.equalsInteger(systemUser.getCompanyId(),company.getId()))){
SystemMenu systemMenu = new SystemMenu();
systemMenu.setType(type);
systemMenu.setDeleted(Boolean.FALSE);
--
Gitblit v1.9.3