From cdd28792b28d3bf88b283c19d45db3479b719683 Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Thu, 11 Feb 2016 11:33:51 +0000 Subject: [PATCH] FSN#35410 Rapport via fclt_3d_afdeling_key ook op bedrijfnivea te beperken svn path=/Website/trunk/; revision=28132 --- APPL/API2/model_reports.inc | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/APPL/API2/model_reports.inc b/APPL/API2/model_reports.inc index 8385bb34c5..feb75dbe5e 100644 --- a/APPL/API2/model_reports.inc +++ b/APPL/API2/model_reports.inc @@ -92,15 +92,24 @@ function model_reports_template() + " WHERE niveau ="+this.authparams.ALGreadlevel + " AND prs_perslid_key="+user_key+"))"); } - if (bMetPRSAuth && "fclt_3d_afdeling_key" in this.fields && this.authparams.PRSreadlevel > 0) + if (bMetPRSAuth && "fclt_3d_afdeling_key" in this.fields) { - wheres.push(" fclt_3d_afdeling_key IN" - + "(SELECT prs_afdeling_key FROM prs_v_afdeling_familie a" - + " WHERE a.prs_afdeling_elder_key IN" - + " (SELECT aa.prs_afdeling_elder_key" - + " FROM prs_v_afdeling_familie aa" - + " WHERE aa.prs_afdeling_key = " + user.prs_afdeling_key() - + " AND aa.niveau = " + this.authparams.PRSreadlevel + "))"); + if (this.authparams.PRSreadlevel == 0) + { + wheres.push(" fclt_3d_afdeling_key IN" + + " (SELECT a.prs_afdeling_key FROM prs_v_afdeling a " + + " WHERE a.prs_bedrijf_key = " + user.afdeling().prs_bedrijf_key() + ")"); + } + else if (this.authparams.PRSreadlevel > 0) + { + wheres.push(" fclt_3d_afdeling_key IN" + + "(SELECT prs_afdeling_key FROM prs_v_afdeling_familie a" + + " WHERE a.prs_afdeling_elder_key IN" + + " (SELECT aa.prs_afdeling_elder_key" + + " FROM prs_v_afdeling_familie aa" + + " WHERE aa.prs_afdeling_key = " + user.prs_afdeling_key() + + " AND aa.niveau = " + this.authparams.PRSreadlevel + "))"); + } } if (bMetDiscipline && "fclt_3d_discipline_key" in this.fields) {