Merge branch 'fix/根据身份查询对象中的群组重复问题' into 'wrdp'

[人员组织]修复根据身份查询对象中的群组重复问题

See merge request o2oa/o2oa!4219

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/identity/ActionListObject.java

@@ -3,6 +3,7 @@ package com.x.organization.assemble.express.jaxrs.identity;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
@@ -115,7 +116,7 @@ class ActionListObject extends BaseAction {
 		CriteriaQuery<UnitDuty> cq = cb.createQuery(UnitDuty.class);
 		Root<UnitDuty> root = cq.from(UnitDuty.class);
 		Predicate p = cb.isMember(woIdentity.getId(), root.get(UnitDuty_.identityList));
-		List<UnitDuty> os = em.createQuery(cq.select(root).where(p)).getResultList();
+		List<UnitDuty> os = em.createQuery(cq.select(root).where(p)).getResultList().stream().distinct().collect(Collectors.toList());
 		List<WoUnitDuty> wos = WoUnitDuty.copier.copy(os);
 		wos = business.unitDuty().sort(wos);
 		for (WoUnitDuty woUnitDuty : wos) {
@@ -143,7 +144,7 @@ class ActionListObject extends BaseAction {
 		if(wo.getWoUnit()!=null){
 			p = cb.or(p, root.get(Group_.unitList).in(wo.getWoUnit().getUnitIdList()));
 		}
-		List<Group> os = em.createQuery(cq.select(root).where(p)).getResultList();
+		List<Group> os = em.createQuery(cq.select(root).where(p)).getResultList().stream().distinct().collect(Collectors.toList());
 		final List<WoGroup> wos = new ArrayList<>();
 		os.stream().forEach(o -> {
 			try {

o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/person/ActionGet.java

@@ -24,6 +24,7 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 class ActionGet extends BaseAction {
 
@@ -94,7 +95,7 @@ class ActionGet extends BaseAction {
 		CriteriaQuery<Role> cq = cb.createQuery(Role.class);
 		Root<Role> root = cq.from(Role.class);
 		Predicate p = cb.isMember(wo.getId(), root.get(Role_.personList));
-		List<Role> os = em.createQuery(cq.select(root).where(p)).getResultList();
+		List<Role> os = em.createQuery(cq.select(root).where(p)).getResultList().stream().distinct().collect(Collectors.toList());
 		List<WoRole> wos = WoRole.copier.copy(os);
 		wos = business.role().sort(wos);
 		wo.setWoRoleList(wos);
@@ -110,7 +111,7 @@ class ActionGet extends BaseAction {
 			List<String> identities = ListTools.extractField(wo.getWoIdentityList(), JpaObject.id_FIELDNAME, String.class, true, true);
 			p = cb.or(p, root.get(Group_.identityList).in(identities));
 		}
-		List<Group> os = em.createQuery(cq.select(root).where(p)).getResultList();
+		List<Group> os = em.createQuery(cq.select(root).where(p)).getResultList().stream().distinct().collect(Collectors.toList());
 		ListOrderedSet<Group> set = new ListOrderedSet<>();
 		os.stream().forEach(o -> {
 			set.add(o);
@@ -142,7 +143,7 @@ class ActionGet extends BaseAction {
 		CriteriaQuery<UnitDuty> cq = cb.createQuery(UnitDuty.class);
 		Root<UnitDuty> root = cq.from(UnitDuty.class);
 		Predicate p = cb.isMember(woIdentity.getId(), root.get(UnitDuty_.identityList));
-		List<UnitDuty> os = em.createQuery(cq.select(root).where(p)).getResultList();
+		List<UnitDuty> os = em.createQuery(cq.select(root).where(p)).getResultList().stream().distinct().collect(Collectors.toList());
 		List<WoUnitDuty> wos = WoUnitDuty.copier.copy(os);
 		wos = business.unitDuty().sort(wos);
 		for (WoUnitDuty woUnitDuty : wos) {