Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-10 2b9cdcbaccb6ea4c4ffe9461d0589ab3e28ef7f3

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

@@ -113,10 +113,20 @@
        return ids;
    }

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

    //递归取id
    private List<String> disposestreetId(List<OrganizationChartEntity> lists)
    {
        List<String> ids=new ArrayList<>();
        if(lists==null || lists.size()<1)
        {
            return ids;
        }

        for (OrganizationChartEntity sysStreet:lists)
        {
            ids.add(sysStreet.getId()+"");