Merge branch '修复人员组织搜索结果为空的问题' into 'wrdp'

hotfix/修复人员组织搜索结果为空的问题

See merge request o2oa/o2oa!6115

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

@@ -136,12 +136,15 @@ class ActionListLike extends BaseAction {
 		if (StringUtils.isEmpty(wi.getKey())) {
 			return wos;
 		}
-		List<String> unitIds = business.expendUnitToUnit(ListTools.trim(wi.getUnitList(), true, true));
-		/** 去掉指定范围本身,仅包含下级 */
-		unitIds.removeAll(ListTools.extractProperty(business.unit().pick(wi.getUnitList()), JpaObject.id_FIELDNAME,
-				String.class, true, true));
-		if(unitIds.isEmpty()){
-			return wos;
+		List<String> unitIds = new ArrayList<>();
+		if(ListTools.isNotEmpty(wi.getUnitList())) {
+			unitIds = business.expendUnitToUnit(ListTools.trim(wi.getUnitList(), true, true));
+			/** 去掉指定范围本身,仅包含下级 */
+			unitIds.removeAll(ListTools.extractProperty(business.unit().pick(wi.getUnitList()), JpaObject.id_FIELDNAME,
+					String.class, true, true));
+			if (unitIds.isEmpty()) {
+				return wos;
+			}
 		}
 		String str = StringUtils.lowerCase(StringTools.escapeSqlLikeKey(wi.getKey()));
 		EntityManager em = business.entityManagerContainer().get(Unit.class);

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

@@ -136,12 +136,15 @@ class ActionListLikePinyin extends BaseAction {
 		if (StringUtils.isEmpty(wi.getKey())) {
 			return wos;
 		}
-		List<String> unitIds = business.expendUnitToUnit(ListTools.trim(wi.getUnitList(), true, true));
-		/** 去掉指定范围本身,仅包含下级 */
-		unitIds.removeAll(ListTools.extractProperty(business.unit().pick(wi.getUnitList()), JpaObject.id_FIELDNAME,
-				String.class, true, true));
-		if(unitIds.isEmpty()){
-			return wos;
+		List<String> unitIds = new ArrayList<>();
+		if(ListTools.isNotEmpty(wi.getUnitList())) {
+			unitIds = business.expendUnitToUnit(ListTools.trim(wi.getUnitList(), true, true));
+			/** 去掉指定范围本身,仅包含下级 */
+			unitIds.removeAll(ListTools.extractProperty(business.unit().pick(wi.getUnitList()), JpaObject.id_FIELDNAME,
+					String.class, true, true));
+			if(unitIds.isEmpty()){
+				return wos;
+			}
 		}
 		String str = StringUtils.lowerCase(StringTools.escapeSqlLikeKey(wi.getKey()));
 		EntityManager em = business.entityManagerContainer().get(Unit.class);

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

@@ -135,12 +135,15 @@ class ActionListPinyinInitial extends BaseAction {
 		if (StringUtils.isEmpty(wi.getKey())) {
 			return wos;
 		}
-		List<String> unitIds = business.expendUnitToUnit(wi.getUnitList());
-		/** 去掉指定范围本身,仅包含下级 */
-		unitIds.removeAll(ListTools.extractProperty(business.unit().pick(wi.getUnitList()), JpaObject.id_FIELDNAME,
-				String.class, true, true));
-		if(unitIds.isEmpty()){
-			return wos;
+		List<String> unitIds = new ArrayList<>();
+		if(ListTools.isNotEmpty(wi.getUnitList())) {
+			unitIds = business.expendUnitToUnit(wi.getUnitList());
+			/** 去掉指定范围本身,仅包含下级 */
+			unitIds.removeAll(ListTools.extractProperty(business.unit().pick(wi.getUnitList()), JpaObject.id_FIELDNAME,
+					String.class, true, true));
+			if (unitIds.isEmpty()) {
+				return wos;
+			}
 		}
 		String str = StringUtils.lowerCase(StringTools.escapeSqlLikeKey(wi.getKey()));
 		EntityManager em = business.entityManagerContainer().get(Unit.class);

o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ActionSetProxy.java

@@ -2,6 +2,8 @@ package com.x.program.center.jaxrs.config;
 
 import java.util.Map.Entry;
 
+import com.x.program.center.ThisApplication;
+import com.x.program.center.schedule.CollectPerson;
 import org.apache.commons.lang3.BooleanUtils;
 
 import com.google.gson.JsonElement;
@@ -35,11 +37,11 @@ class ActionSetProxy extends BaseAction {
 
 			}
 		}
-		
+
 		for (Application o : wi.getApplicationList()) {
 			 Node node = null;
 			if(o.getNode().equalsIgnoreCase("")) {
-				node = Config.nodes().get("127.0.0.1");	
+				node = Config.nodes().get("127.0.0.1");
 			}else {
 			    node = Config.nodes().get(o.getNode());
 			}
@@ -48,10 +50,11 @@ class ActionSetProxy extends BaseAction {
 				node.getApplication().setProxyPort(o.getProxyPort());
 			}
 		}
-		
-		
+
 		Config.nodes().save();
 		this.configFlush(effectivePerson);
+
+		ThisApplication.context().scheduleLocal(CollectPerson.class);
 		Wo wo = new Wo();
 		wo.setValue(true);
 		result.setData(wo);
@@ -64,4 +67,4 @@ class ActionSetProxy extends BaseAction {
 	public static class Wi extends AbstractWoProxy {
 	}
 
-}
\ No newline at end of file
+}