restore correct order by composition

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java

@@ -136,8 +136,8 @@ public List<T> findByWhere(String where, Map<String, Object> parameters, String
 			throws PersistenceException {
 		List<T> coll = new ArrayList<>();
 		try {
-			String sorting = StringUtils.isNotEmpty(order) && !order.toLowerCase().contains(ORDER_BY)
-					? ORDER_BY + " " + order
+			String sorting = StringUtils.isNotEmpty(order) && !order.toLowerCase().contains(ORDER_BY.trim())
+					? ORDER_BY + order
 					: order;
 			String query = "from " + entityClass.getCanonicalName() + DEFAULT_WHERE_PREAMBLE
 					+ (StringUtils.isNotEmpty(where) ? AND + where + ") " : " ")
@@ -195,7 +195,7 @@ public List<Long> findIdsByWhere(String where, Map<String, Object> parameters, S
 			throws PersistenceException {
 		try {
 			String sorting = StringUtils.isNotEmpty(order) && !order.toLowerCase().contains(ORDER_BY)
-					? ORDER_BY + " " + order
+					? ORDER_BY + order
 					: order;
 			String query = "select " + ENTITY + ".id from " + entityClass.getCanonicalName() + DEFAULT_WHERE_PREAMBLE
 					+ (StringUtils.isNotEmpty(where) ? AND + where + ") " : " ")