From d2cb1ea91d2824983fe23f8246b25f755735b65b Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Mon, 4 Mar 2024 14:56:17 +0100 Subject: [PATCH] support group user / admin data --- .../calender/supportgroup/SupportGroup.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java index d9da69e..88eb66b 100644 --- a/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java +++ b/backend/src/main/java/com/nttdata/calender/supportgroup/SupportGroup.java @@ -49,13 +49,15 @@ public class SupportGroup { var querySupportGroups = new Query.QueryBuilder(formAssoc) .addFieldId("SupportGroup", 1000000015) .addFieldId("SupportGroupId", 1000000079) + .addFieldId("FunctionalRole", 1000000172) .build(); System.out.println(api.isAdministrator()); - if (api.isAdministrator()) { + + if (!api.isAdministrator()) { this.supportGroups = api - .queryFieldsById("\'4\' != \"_\"", querySupportGroups.getFieldIds(), + .queryFieldsById("\'1000000172\' == 5000 OR \'1000000172\' == 6000", querySupportGroups.getFieldIds(), querySupportGroups.getFormName(), null, 0, 0) .stream() .map(entry -> new SupportGroupGetResponse( @@ -63,9 +65,16 @@ public class SupportGroup { entry.get(querySupportGroups.getFieldId("SupportGroupId")).toString())) .distinct() .collect(Collectors.toCollection(ArrayList::new)); + + // nur zum testen + var test = api + .queryFieldsById("\'1000000172\' == 5000 OR \'1000000172\' == 6000", querySupportGroups.getFieldIds(), + querySupportGroups.getFormName(), null, 0, 0); + for (var t : test) System.out.println(t); + } else { this.supportGroups = api - .queryFieldsById("\'4\' == \"" + api.getUser() + "\"", querySupportGroups.getFieldIds(), + .queryFieldsById("\'4\' != \"_\"", querySupportGroups.getFieldIds(), querySupportGroups.getFormName(), null, 0, 0) .stream() .map(entry -> new SupportGroupGetResponse(