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

lidongdong

2022-11-02 68fd2f086d80dd766dd3f84b7a92a2683547fb00

 flower_city/src/main/java/com/dg/core/util/PermissionUtil.java

@@ -46,7 +46,8 @@
        else if(StringUtils.equals("1", sysUser.getUserType()))
        {
            //管理员
            List<String> ids=iOrganizationChartService.getIds("");
//            List<String> ids=iOrganizationChartService.getIds("");
            List<String> ids=null;
            return ids;
        }
        else