From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 3b5aa86..0089867 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
@@ -138,7 +138,7 @@
         List<SystemMenu> menus = new ArrayList<SystemMenu>();
         List<SystemMenuNodeVO> rootNodes = new ArrayList<>();
         menus = systemMenuService.findByUserId(userId,type);
-        if(type.equals(Constants.ONE)){
+        if(type.equals(Constants.ONE) || type.equals(Constants.TWO)){
             LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
             Company company = companyService.findById(loginUserInfo.getCompanyId());
             if(Objects.isNull(company)){

--
Gitblit v1.9.3