From d6201c37c34681b11d6eeb5d3fa2008991d9f370 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 12 四月 2024 15:26:21 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java index b807e38..791f880 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java @@ -12,7 +12,7 @@ import com.zy.asrs.wcs.system.service.MenuService; import com.zy.asrs.wcs.utils.ExcelUtil; import com.zy.asrs.wcs.utils.NodeUtils; -import com.zy.asrs.wcs.utils.Utils; +import com.zy.asrs.wcs.utils.CommonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -49,10 +49,10 @@ // List<Menu> menus = menuService.list(wrapper); // return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren)); List<Menu> menuList = menuService.list(new LambdaQueryWrapper<Menu>().orderByAsc(Menu::getSort)); - List<Menu> treeData = Utils.toTreeData(menuList, 0L, Menu::getParentId, Menu::getId, Menu::setChildren); + List<Menu> treeData = CommonUtils.toTreeData(menuList, 0L, Menu::getParentId, Menu::getId, Menu::setChildren); if (!Cools.isEmpty(map.get("condition"))) { - Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Menu::getName, Menu::getChildren); - Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Menu::getName, Menu::getChildren); + CommonUtils.treeRemove(treeData, String.valueOf(map.get("condition")), Menu::getName, Menu::getChildren); + CommonUtils.treeRemove(treeData, String.valueOf(map.get("condition")), Menu::getName, Menu::getChildren); } return R.ok().add(treeData); } -- Gitblit v1.9.1