x_query_assemble_surface fixed

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/query/ActionListWithPerson.java

@@ -1,6 +1,7 @@
 package com.x.query.assemble.surface.jaxrs.query;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.persistence.EntityManager;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -77,7 +78,7 @@ class ActionListWithPerson extends BaseAction {
 				p = cb.or(p, root.get(Query_.availableUnitList).in(units));
 			}
 		}
-		cq.select(root.get(Query_.id)).distinct(true).where(p);
-		return em.createQuery(cq).getResultList();
+		cq.select(root.get(Query_.id)).where(p);
+		return em.createQuery(cq).getResultList().stream().distinct().collect(Collectors.toList());
 	}
 }

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/query/ActionListWithPersonLike.java

@@ -1,6 +1,7 @@
 package com.x.query.assemble.surface.jaxrs.query;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.persistence.EntityManager;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -79,7 +80,7 @@ class ActionListWithPersonLike extends BaseAction {
 				p = cb.or(p, root.get(Query_.availableUnitList).in(units));
 			}
 		}
-		cq.select(root.get(Query_.id)).distinct(true).where(p);
-		return em.createQuery(cq).getResultList();
+		cq.select(root.get(Query_.id)).where(p);
+		return em.createQuery(cq).getResultList().stream().distinct().collect(Collectors.toList());
 	}
 }

o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/Learn.java

@@ -283,7 +283,7 @@ public class Learn {
 		cq.select(root).where(p).orderBy(cb.desc(root.get(InText_.count)));
 		Integer cutoff = MapTools.getInteger(model.getPropertyMap(), Model.PROPERTY_MLP_LEARNINTEXTCUTOFFSIZE,
 				Model.DEFAULT_MLP_LEARNINTEXTCUTOFFSIZE);
-		List<InText> os = em.createQuery(cq.distinct(true)).setMaxResults(cutoff).getResultList();
+		List<InText> os = em.createQuery(cq).setMaxResults(cutoff).getResultList();
 		InTextBag inTextBag = new InTextBag(os);
 		return inTextBag;
 	}