Merge branch 'fix/组织管理人员搜索问题' into 'develop'

【人员组织】修复组织管理人员搜索问题 to develop

See merge request o2oa/o2oa!1240

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListLike.java

@@ -107,7 +107,9 @@ class ActionListLike extends BaseAction {
 		if (ListTools.isNotEmpty(personIds)) {
 			p = cb.and(p, root.get(Person_.id).in(personIds));
 		}else{
-			return wos;
+			if(ListTools.isNotEmpty(wi.getGroupList(), wi.getRoleList())) {
+				return wos;
+			}
 		}
 		p = cb.and(p, business.personPredicateWithTopUnit(effectivePesron));
 		List<Person> os = em.createQuery(cq.select(root).where(p)).getResultList();

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListLikePinyin.java

@@ -103,7 +103,9 @@ class ActionListLikePinyin extends BaseAction {
 		if (ListTools.isNotEmpty(personIds)) {
 			p = cb.and(p, root.get(Person_.id).in(personIds));
 		}else{
-			return wos;
+			if(ListTools.isNotEmpty(wi.getGroupList(), wi.getRoleList())) {
+				return wos;
+			}
 		}
 		p = cb.and(p, business.personPredicateWithTopUnit(effectivePerson));
 		List<Person> os = em.createQuery(cq.select(root).where(p)).getResultList();

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPinyinInitial.java

@@ -111,7 +111,9 @@ class ActionListPinyinInitial extends BaseAction {
 		if (ListTools.isNotEmpty(personIds)) {
 			p = cb.and(p, root.get(Person_.id).in(personIds));
 		}else{
-			return wos;
+			if(ListTools.isNotEmpty(wi.getGroupList(), wi.getRoleList())) {
+				return wos;
+			}
 		}
 		p = cb.and(p, business.personPredicateWithTopUnit(effectivePerson));
 		List<Person> os = em.createQuery(cq.select(root).where(p)).getResultList();