Merge branch '同步到collect的urlmapping允许置空' into 'master'

hotfix/同步到collect的urlmapping允许置空 同时合并到develop

See merge request o2oa/o2oa!713

o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectPerson.java

@@ -66,8 +66,8 @@ public class CollectPerson extends BaseAction {
 						}
 						req.setCenterProxyPort(centerServer.getProxyPort());
 						req.setHttpProtocol(centerServer.getHttpProtocol());
-						if(null != Config.portal().getUrlMapping() && !(Config.portal().getUrlMapping().isEmpty())){
-							req.setUrlMapping(XGsonBuilder.instance().toJsonTree(Config.portal().getUrlMapping()));
+						if(null != Config.portal().getUrlMapping()){
+							req.setUrlMapping(XGsonBuilder.convert(XGsonBuilder.toJson(Config.portal().getUrlMapping()), JsonElement.class));
 						}
 						try {
 							ActionResponse response = ConnectionAction
@@ -210,4 +210,4 @@ public class CollectPerson extends BaseAction {
 		return ListTools.trim(list, true, true);
 	}
 
-}
\ No newline at end of file
+}