From 0f33ada194c133c89bdd0cc49e06a4385eae69e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:48:27 +0000 Subject: [PATCH 1/3] Bump commons-io:commons-io from 2.7 to 2.14.0 Bumps commons-io:commons-io from 2.7 to 2.14.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73adca4d..1c9f4142 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ commons-io commons-io - 2.7 + 2.14.0 org.apache.maven From 1920dcabd60f2b24f4cc464fb54ef1749a670213 Mon Sep 17 00:00:00 2001 From: Github Action Date: Thu, 10 Oct 2024 09:45:21 +0000 Subject: [PATCH 2/3] Version 3.1.1-SNAPSHOT [skip ci] --- batch/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 2 +- web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/batch/pom.xml b/batch/pom.xml index b5e26043..6c34d3bf 100644 --- a/batch/pom.xml +++ b/batch/pom.xml @@ -3,7 +3,7 @@ itembackoffice fr.abes.item - 3.1.0 + 3.1.1-SNAPSHOT 4.0.0 jar diff --git a/core/pom.xml b/core/pom.xml index ccee085c..39183be9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ itembackoffice fr.abes.item - 3.1.0 + 3.1.1-SNAPSHOT 4.0.0 jar diff --git a/pom.xml b/pom.xml index caaf0418..f2ece423 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ fr.abes.item itembackoffice - 3.1.0 + 3.1.1-SNAPSHOT core web diff --git a/web/pom.xml b/web/pom.xml index e084bbe7..c1df7f37 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,7 +3,7 @@ itembackoffice fr.abes.item - 3.1.0 + 3.1.1-SNAPSHOT 4.0.0 jar From 357e809afde8ab5c0d289f75b9d1a4880695e713 Mon Sep 17 00:00:00 2001 From: Jerome Villiseck Date: Mon, 14 Oct 2024 15:08:52 +0200 Subject: [PATCH 3/3] =?UTF-8?q?-=20Ajout=20d'un=20filtre=20sur=20930$b=20a?= =?UTF-8?q?fin=20de=20n'afficher=20que=20les=20exemplaires=20de=20son=20RC?= =?UTF-8?q?R=20et=20non=20plus=20les=20exemplaires=20de=20son=20ILN=20-=20?= =?UTF-8?q?Les=20exemplaires=20restants=20sont=20calcul=C3=A9s=20=C3=A0=20?= =?UTF-8?q?partir=20des=20exemplaires=20filtr=C3=A9s,=20normalement=20il?= =?UTF-8?q?=20n'y=20a=20pas=20lieu=20de=20proc=C3=A9der=20=C3=A0=20un=20se?= =?UTF-8?q?cond=20filtre?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/fr/abes/item/core/service/impl/DemandeSuppService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/fr/abes/item/core/service/impl/DemandeSuppService.java b/core/src/main/java/fr/abes/item/core/service/impl/DemandeSuppService.java index 7fad4c98..c23101d9 100644 --- a/core/src/main/java/fr/abes/item/core/service/impl/DemandeSuppService.java +++ b/core/src/main/java/fr/abes/item/core/service/impl/DemandeSuppService.java @@ -361,6 +361,8 @@ public String[] getNoticeExemplaireAvantApres(Demande demande, LigneFichier lign try { traitementService.authenticate("M" + demandeSupp.getRcr()); List exemplairesExistants = getExemplairesExistants(ligneFichierSupp); + //On ne conserve que les EPN de son RCR + exemplairesExistants = exemplairesExistants.stream().filter(exemplaire -> exemplaire.findZone("930", 0).findSubLabel("$b").equals(demandeSupp.getRcr())).toList(); if (exemplairesExistants.isEmpty()) { return new String[] { ligneFichierSupp.getPpn(),