From c5675caab8392bfafd217d06529c2547edaa6aa8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 25 九月 2025 14:46:01 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
index e6d6a63..edf8379 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
@@ -3,6 +3,7 @@
import com.doumee.biz.system.SystemMenuBiz;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.dao.system.model.SystemMenu;
import com.doumee.dao.system.vo.SystemMenuListVO;
@@ -86,17 +87,26 @@
}
for (int i = 0; i < menuPool.size(); i++) {
menuPool.get(i).setSort(i);
+ menuPool.get(i).setUpdateUser(dto.getUpdateUser());
}
// 淇敼
systemMenuService.updateByIdInBatch(menuPool);
}
@Override
- public List<SystemMenuListVO> findTree() {
- List<SystemMenuListVO> menus = systemMenuService.findList();
+ public List<SystemMenu> findTopList() {
+ SystemMenu param =new SystemMenu();
+ param.setDeleted(Boolean.FALSE);
+ param.setType(Constants.ONE);
+ List<SystemMenu> menus = systemMenuService.findList(param);
+ return menus;
+ }
+ @Override
+ public List<SystemMenuListVO> findTree(SystemMenu param) {
+ List<SystemMenuListVO> menus = systemMenuService.findManageList(param);
List<SystemMenuListVO> rootMenus = new ArrayList<>();
// 娣诲姞鏍硅彍鍗�
- for (SystemMenu menu : menus) {
+ for (SystemMenuListVO menu : menus) {
if (menu.getParentId() == null) {
SystemMenuListVO rootMenu = new SystemMenuListVO();
BeanUtils.copyProperties(menu, rootMenu, "children");
@@ -125,6 +135,9 @@
nodeVO.setIndex("menu_" + menu.getId());
nodeVO.setLabel(menu.getName());
nodeVO.setUrl(menu.getPath());
+ nodeVO.setParams(menu.getParams());
+ nodeVO.setType(menu.getType());
+ nodeVO.setLinkType(menu.getLinkType());
nodeVO.setIcon(menu.getIcon());
nodeVO.setChildren(new ArrayList<>());
rootNodes.add(nodeVO);
@@ -175,6 +188,9 @@
}
List<Integer> handledIds = new ArrayList<>();
for (SystemMenu menu : menus) {
+ if(!Constants.equalsInteger(menu.getType(),Constants.ZERO)){
+ continue;
+ }
if (parent.getId().equals(menu.getParentId())) {
SystemMenuListVO child = new SystemMenuListVO();
BeanUtils.copyProperties(menu, child, "children");
@@ -204,12 +220,18 @@
}
List<Integer> handledIds = new ArrayList<>();
for (SystemMenu menu : menus) {
+ if(!Constants.equalsInteger(menu.getType(),Constants.ZERO)){
+ continue;
+ }
if (parent.getId().equals(menu.getParentId())) {
SystemMenuNodeVO child = new SystemMenuNodeVO();
child.setId(menu.getId());
child.setLabel(menu.getName());
child.setUrl(menu.getPath());
+ child.setParams(menu.getParams());
child.setIcon(menu.getIcon());
+ child.setType(menu.getType());
+ child.setLinkType(menu.getLinkType());
child.setIndex("menu_" + menu.getId());
child.setChildren(new ArrayList<>());
parent.getChildren().add(child);
--
Gitblit v1.9.3