From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:52:01 +0800
Subject: [PATCH] 解决冲突
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 7f17be8..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
@@ -92,8 +92,8 @@
}
@Override
- public List<SystemMenuListVO> findTree() {
- List<SystemMenuListVO> menus = systemMenuService.findList();
+ public List<SystemMenuListVO> findTreeByType(Integer type) {
+ List<SystemMenuListVO> menus = systemMenuService.findList(type);
List<SystemMenuListVO> rootMenus = new ArrayList<>();
// 娣诲姞鏍硅彍鍗�
for (SystemMenu menu : menus) {
@@ -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