用户查询限制问题修复

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

@@ -106,6 +106,8 @@ class ActionListLike extends BaseAction {
 		p = cb.or(p, cb.like(cb.lower(root.get(Person_.distinguishedName)), str + "%", StringTools.SQL_ESCAPE_CHAR));
 		if (ListTools.isNotEmpty(personIds)) {
 			p = cb.and(p, root.get(Person_.id).in(personIds));
+		}else{
+			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

@@ -102,6 +102,8 @@ class ActionListLikePinyin extends BaseAction {
 		p = cb.or(p, cb.like(root.get(Person_.pinyinInitial), str + "%"));
 		if (ListTools.isNotEmpty(personIds)) {
 			p = cb.and(p, root.get(Person_.id).in(personIds));
+		}else{
+			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

@@ -110,6 +110,8 @@ class ActionListPinyinInitial extends BaseAction {
 		Predicate p = cb.like(root.get(Person_.pinyinInitial), str + "%", StringTools.SQL_ESCAPE_CHAR);
 		if (ListTools.isNotEmpty(personIds)) {
 			p = cb.and(p, root.get(Person_.id).in(personIds));
+		}else{
+			return wos;
 		}
 		p = cb.and(p, business.personPredicateWithTopUnit(effectivePerson));
 		List<Person> os = em.createQuery(cq.select(root).where(p)).getResultList();

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionList.java

@@ -19,7 +19,7 @@ class ActionList extends BaseAction {
 	ActionResult<List<Wo>> execute(HttpServletRequest request, String source) throws Exception {
 		ActionResult<List<Wo>> result = new ActionResult<>();
 		List<Wo> wos = new ArrayList<>();
-		Boolean fromProxy = this.formProxy(request, source);
+		Boolean fromProxy = this.formProxy(request, this.getHost(request));
 		String httpProtocol = "http://"; //O2LEE，修正如果开启SSL，x_program_center/jest/list.html 给出的URL都是HTTP协议的，无法访问的问题
 		for (Entry<String, CopyOnWriteArrayList<Application>> en : ThisApplication.context().applications()
 				.entrySet()) {