Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

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

@@ -139,6 +139,7 @@
                nodeVO.setType(menu.getType());
                nodeVO.setLinkType(menu.getLinkType());
                nodeVO.setIcon(menu.getIcon());
//                nodeVO.setHomeUrl("/index");//默认工作台
                nodeVO.setChildren(new ArrayList<>());
                rootNodes.add(nodeVO);
            }
@@ -146,10 +147,29 @@
        menus.removeIf(menu -> menu.getParentId() == null);
        for (SystemMenuNodeVO child : rootNodes) {
            this.fillChildren(child, menus);
            SystemMenuNodeVO homeMenus = getHomeUrlByChild(child);
            if(homeMenus!=null && homeMenus.getUrl() != null){
                    child.setHomeUrl(homeMenus.getUrl());
            }
        }
        return rootNodes;
    }

    private SystemMenuNodeVO getHomeUrlByChild( SystemMenuNodeVO  child) {
        if(child.getChildren()==null || child.getChildren().size() ==0){
            return null;
        }
        for(SystemMenuNodeVO tt : child.getChildren()){
            if(tt.getChildren()==null || tt.getChildren().size() ==0){
                return tt;
            }else{
                SystemMenuNodeVO ttt = getHomeUrlByChild(tt);
                return ttt;
            }
        }
        return null;
    }

    @Override
    public void deleteById(Integer id) {
        List<Integer> ids = systemMenuService.findChildren(id);