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

lidongdong

2022-10-26 45a27814a10252ebc36e435aee5ca3a4b3decdc4

 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -54,7 +54,7 @@
    @Authorization
    public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
    {
        return getOrganizations(sysUser.getDepartmentId());
        return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
    }

    /**