Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-15 6a1a6dda565342de58e7ce70fb78e628e8493b0c

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -331,9 +331,16 @@
        String userId=null;
        if( StringUtils.equals("2",sysUser.getRoleIds()))
        {
            userId=sysUser.getUserId()+"";
            ids=new ArrayList<>();
            ids.add(sysUser.getDepartmentId());
            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
            {
                ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
            }
            else
            {
                userId=sysUser.getUserId()+"";
                ids=new ArrayList<>();
                ids.add(sysUser.getDepartmentId());
            }
        }
        else
        {