jiangping
2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9
server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
@@ -72,6 +72,8 @@
        List<SystemMenu> menuPool;
        if (currentMenu.getParentId() == null) {
            menuPool = systemMenuService.findRootList();
            //2024年11月16日13:51:53 过滤同类型数据
            menuPool = menuPool.stream().filter(i->Constants.equalsInteger(i.getType(),currentMenu.getType())).collect(Collectors.toList());
        } else {
            SystemMenu queryDto = new SystemMenu();
            queryDto.setParentId(currentMenu.getParentId());
@@ -144,11 +146,14 @@
            if(Objects.isNull(company)){
                return rootNodes;
            }
            SystemUser systemUser = systemUserService.findById(userId);
            SystemUser dbUser = new SystemUser();
            dbUser.setId(loginUserInfo.getId());
            SystemUser systemUser = systemUserService.findOne(dbUser);
            if(Objects.isNull(systemUser)){
                return rootNodes;
            }
            if(company.getUsername().equals(systemUser.getUsername())){
            if(company.getUsername().equals(systemUser.getUsername())
            || (Constants.equalsInteger(type,Constants.ONE) && !Constants.equalsInteger(systemUser.getCompanyId(),company.getId()))){
                SystemMenu systemMenu = new SystemMenu();
                systemMenu.setType(type);
                systemMenu.setDeleted(Boolean.FALSE);