This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 7f1e1226f4c30d240c31472d1e1f970cc5ee3938 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 11 07:20:50 2015 +0200 Correction du filtrage sur les océans et le sex qui n'était pas correct dans la rechercher d'une RTP (refs #7286) --- .../src/main/java/fr/ird/observe/DataService.java | 27 ++++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DataService.java b/observe-business/src/main/java/fr/ird/observe/DataService.java index db3693c..1588771 100644 --- a/observe-business/src/main/java/fr/ird/observe/DataService.java +++ b/observe-business/src/main/java/fr/ird/observe/DataService.java @@ -896,10 +896,7 @@ public class DataService { try { - List<P> list = LengthWeightParemeterHelper.findBySpecies( - (TopiaContextImplementor) tx, - species - ); + List<P> list = LengthWeightParemeterHelper.findBySpecies((TopiaContextImplementor) tx, species); if (CollectionUtils.isEmpty(list)) { @@ -908,13 +905,14 @@ public class DataService { } // filtrage par ocean - list = LengthWeightParemeterHelper.filterByOcean(list, ocean); + List<P> filterByOcean = LengthWeightParemeterHelper.filterByOcean(list, ocean); - if (CollectionUtils.isEmpty(list) && ocean != null) { + if (CollectionUtils.isEmpty(filterByOcean) && ocean != null) { // filtre par ocean null - list = LengthWeightParemeterHelper.filterByOcean(list, null); + filterByOcean = LengthWeightParemeterHelper.filterByOcean(list, null); } + list = filterByOcean; if (CollectionUtils.isEmpty(list)) { @@ -923,18 +921,19 @@ public class DataService { } // filtrage par sexe - list = LengthWeightParemeterHelper.filterBySexe(list, sex); + List<P> filterBySexe = LengthWeightParemeterHelper.filterBySexe(list, sex); - if (CollectionUtils.isEmpty(list)) { + if (CollectionUtils.isEmpty(filterBySexe)) { Sex unkwonSex = getUnknownSex(tx); - if (unkwonSex.equals(sex)) { + if (sex==null || unkwonSex.equals(sex)) { // filtrage par sexe indetermine - list = LengthWeightParemeterHelper.filterBySexe(list, unkwonSex); + filterBySexe = LengthWeightParemeterHelper.filterBySexe(list, unkwonSex); } + list = filterBySexe; } @@ -945,8 +944,7 @@ public class DataService { } // filtrage par startDate de validite - list = LengthWeightParemeterHelper.filterByDateDebutValidite(list, - date); + list = LengthWeightParemeterHelper.filterByDateDebutValidite(list, date); if (CollectionUtils.isEmpty(list)) { @@ -955,8 +953,7 @@ public class DataService { } // filtrage par endDate de validite - list = LengthWeightParemeterHelper.filterByDateFinValidite(list, - date); + list = LengthWeightParemeterHelper.filterByDateFinValidite(list, date); if (CollectionUtils.isEmpty(list)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.