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

张天森

2022-10-11 f0e82623c9b60b17210da35deec49d27f79c1383

 flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java

@@ -89,9 +89,15 @@
        return baseMapper.countList(organizationName);
    }


    @Override
    public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
        return baseMapper.selectConfigList(parentId,grade);
    }

    /**
     * 递归获取id  内部使用
     * @param departmentId
     * @param id
     * @return
     */

@@ -113,10 +119,7 @@
        return ids;
    }

    @Override
    public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
        return baseMapper.selectConfigList(parentId,grade);
    }


    //递归取id
    private List<String> disposestreetId(List<OrganizationChartEntity> lists)
@@ -129,6 +132,8 @@

        for (OrganizationChartEntity sysStreet:lists)
        {
            if(sysStreet!=null&&sysStreet.getId()!=null)
            {
            ids.add(sysStreet.getId()+"");
            if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
            {
@@ -139,6 +144,7 @@
                ids.add(sysStreet.getId()+"");
            }
        }
        }
        return ids;
    }