This is an automated email from the git hooks/post-receive script. New commit to branch feature/9936_Erreur_en_cliquant_sur_un_sous_dossier in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 694aecf69f1982b9bb322b47cfa752f8f392eab1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 6 14:25:25 2018 +0200 refs #9936 : correction de la clause group by --- .../faxtomail/persistence/entities/EmailTopiaDao.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index 295e37a0..b0c4231b 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -544,9 +544,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { orderClause, desc); } else { String originalClause = orderClause; - orderClause += "." + FaxToMailUser.PROPERTY_LAST_NAME - + ", " + originalClause + "." + FaxToMailUser.PROPERTY_FIRST_NAME - + ", " + originalClause + "." + FaxToMailUser.PROPERTY_TRIGRAPH; + orderClause += "." + FaxToMailUser.PROPERTY_LAST_NAME; pagination = PaginationParameter.of(pagination.getPageNumber(), pagination.getPageSize(), originalClause + "." + FaxToMailUser.PROPERTY_LAST_NAME, desc, originalClause + "." + FaxToMailUser.PROPERTY_FIRST_NAME, desc, @@ -579,6 +577,12 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { hqlForFetchStep1.append(" ").append(query).append(" GROUP BY ") .append(EMAIL_IDENTIFIER).append(".").append(Email.PROPERTY_TOPIA_ID); + // on ajoute les autres colones d'ordre dans le groupe by + for (int indexClause = 1; indexClause < pagination.getOrderClauses().size(); indexClause++) { + String clause = pagination.getOrderClauses().get(indexClause).getClause(); + if (!(EMAIL_IDENTIFIER + "." + Email.PROPERTY_TOPIA_ID).equals(clause)) + hqlForFetchStep1.append(", ").append(clause); + } if (orderClause != null && !orderByWithSum && !orderByWithSize) { hqlForFetchStep1.append(", ").append(orderClause); } else if (orderByWithSize && tableToJoin != null) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.