From a7e6a3b52c64ba9add0ceb643d6915473a7770a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 16:48:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 4 ++--
1 files changed, 2 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 d16927f..0d96c2f 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
@@ -112,10 +112,10 @@
}
@Override
- public List<SystemMenuNodeVO> findTree (Integer userId) {
+ public List<SystemMenuNodeVO> findTree (Integer userId,Integer type) {
SystemMenu queryDto = new SystemMenu();
queryDto.setDeleted(Boolean.FALSE);
- List<SystemMenu> menus = systemMenuService.findByUserId(userId);
+ List<SystemMenu> menus = systemMenuService.findByUserId(userId,type);
List<SystemMenuNodeVO> rootNodes = new ArrayList<>();
// 娣诲姞鏍硅彍鍗�
for (SystemMenu menu : menus) {
--
Gitblit v1.9.3