Merge remote-tracking branch 'origin/master'

k94314517

2024-09-14 45eba96821e886b5ae738e30af5332d27589c7b3

 server/system_service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java

@@ -86,6 +86,7 @@
        }
        for (int i = 0; i < menuPool.size(); i++) {
            menuPool.get(i).setSort(i);
            menuPool.get(i).setUpdateUser(dto.getUpdateUser());
        }
        // 修改
        systemMenuService.updateByIdInBatch(menuPool);
@@ -125,6 +126,7 @@
                nodeVO.setIndex("menu_" + menu.getId());
                nodeVO.setLabel(menu.getName());
                nodeVO.setUrl(menu.getPath());
                nodeVO.setParams(menu.getParams());
                nodeVO.setIcon(menu.getIcon());
                nodeVO.setChildren(new ArrayList<>());
                rootNodes.add(nodeVO);
@@ -209,6 +211,7 @@
                child.setId(menu.getId());
                child.setLabel(menu.getName());
                child.setUrl(menu.getPath());
                child.setParams(menu.getParams());
                child.setIcon(menu.getIcon());
                child.setIndex("menu_" + menu.getId());
                child.setChildren(new ArrayList<>());