Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-12-05 e15953aee9418b28d324a67bc9daf8e1ff831c7d

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

@@ -55,6 +55,7 @@
        {
            //导办人员
            List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
//            List<String> ids=getStairDepartment(sysUser,iOrganizationChartService);
            return ids;
        }
        else if(StringUtils.equals("1", sysUser.getUserType()))