Merge branch 'fix/#174' into 'develop'

修正person.name进行trim

See merge request o2oa/o2oa!899

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

@@ -3,22 +3,18 @@ package com.x.organization.assemble.control.jaxrs.person;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.annotation.CheckPersistType;
-import com.x.base.core.project.Applications;
 import com.x.base.core.project.x_message_assemble_communicate;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
 import com.x.base.core.project.config.Config;
 import com.x.base.core.project.connection.ActionResponse;
-import com.x.base.core.project.connection.CipherConnectionAction;
 import com.x.base.core.project.exception.ExceptionAccessDenied;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
@@ -35,6 +31,8 @@ import com.x.organization.assemble.control.message.OrgMessageFactory;
 import com.x.organization.core.entity.Person;
 import com.x.organization.core.entity.Unit;
 
+import org.apache.commons.lang3.StringUtils;
+
 class ActionCreate extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionCreate.class);
@@ -46,7 +44,8 @@ class ActionCreate extends BaseAction {
 			Business business = new Business(emc);
 			Person person = new Person();
 			Wi.copier.copy(wi, person);
-
+			// 防止创建的时候加了空格
+			person.setName(StringUtils.trim(person.getName()));
 			if ((!business.hasAnyRole(effectivePerson, OrganizationDefinition.OrganizationManager,
 					OrganizationDefinition.PersonManager, OrganizationDefinition.Manager))
 					&& (!effectivePerson.isManager()) && (!effectivePerson.isCipher())) {
@@ -78,9 +77,9 @@ class ActionCreate extends BaseAction {
 
 			/** 不设置默认头像,可以通过为空直接显示默认头像 */
 			if (StringUtils.isNotEmpty(wi.getPassword())) {
-				business.person().setPassword(person, wi.getPassword(),true);
+				business.person().setPassword(person, wi.getPassword(), true);
 			} else {
-				business.person().setPassword(person, this.initPassword(business, person),true);
+				business.person().setPassword(person, this.initPassword(business, person), true);
 			}
 			/** 设置默认管理员 */
 			this.convertControllerList(effectivePerson, business, person);
@@ -91,12 +90,12 @@ class ActionCreate extends BaseAction {
 			ApplicationCache.notify(Person.class);
 			/** 通知x_collect_service_transmit同步数据到collect */
 			business.instrument().collect().person();
-			
-			/**创建 组织变更org消息通信 */
-			//createMessageCommunicate(person,  effectivePerson);
-			OrgMessageFactory  orgMessageFactory = new OrgMessageFactory();
+
+			/** 创建 组织变更org消息通信 */
+			// createMessageCommunicate(person, effectivePerson);
+			OrgMessageFactory orgMessageFactory = new OrgMessageFactory();
 			orgMessageFactory.createMessageCommunicate("add", "person", person, effectivePerson);
-			
+
 			Wo wo = new Wo();
 			wo.setId(person.getId());
 			result.setData(wo);
@@ -136,14 +135,14 @@ class ActionCreate extends BaseAction {
 			person.setControllerList(ids);
 		}
 	}
-	
-	/**创建 组织变更org消息通信 */
+
+	/** 创建 组织变更org消息通信 */
 	private boolean createMessageCommunicate(Person person, EffectivePerson effectivePerson) {
-		try{
+		try {
 			Gson gson = new Gson();
 			String strPerson = gson.toJson(person);
 			OrgMessage orgMessage = new OrgMessage();
-			
+
 			orgMessage.setOperType("add");
 			orgMessage.setOrgType("person");
 			orgMessage.setOperUerId(effectivePerson.getDistinguishedName());
@@ -151,25 +150,26 @@ class ActionCreate extends BaseAction {
 			orgMessage.setReceiveSystem("");
 			orgMessage.setConsumed(false);
 			orgMessage.setConsumedModule("");
-			
+
 			OrgBodyMessage orgBodyMessage = new OrgBodyMessage();
 			orgBodyMessage.setOriginalData(strPerson);
-			orgMessage.setBody( gson.toJson(orgBodyMessage));
-			
-			String path ="org/create";
-		     //String address = "http://127.0.0.1:20020/x_message_assemble_communicate/jaxrs/org/create";
-		     //ActionResponse resp = CipherConnectionAction.post(false, address, body);
-		     
-			ActionResponse resp =  ThisApplication.context().applications()
-						.postQuery(x_message_assemble_communicate.class, path, orgMessage);
-		
+			orgMessage.setBody(gson.toJson(orgBodyMessage));
+
+			String path = "org/create";
+			// String address =
+			// "http://127.0.0.1:20020/x_message_assemble_communicate/jaxrs/org/create";
+			// ActionResponse resp = CipherConnectionAction.post(false, address, body);
+
+			ActionResponse resp = ThisApplication.context().applications()
+					.postQuery(x_message_assemble_communicate.class, path, orgMessage);
+
 			String mess = resp.getMessage();
 			String data = resp.getData().toString();
 			return true;
-			}catch(Exception e) {
-				logger.print(e.toString());
-				return false;
-			}	
+		} catch (Exception e) {
+			logger.print(e.toString());
+			return false;
+		}
 	}
 
 }

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

@@ -1,11 +1,15 @@
 package com.x.organization.assemble.control.jaxrs.person;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.annotation.CheckPersistType;
+import com.x.base.core.project.x_message_assemble_communicate;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
@@ -18,7 +22,6 @@ import com.x.base.core.project.jaxrs.WoId;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.tools.ListTools;
-import com.x.base.core.project.x_message_assemble_communicate;
 import com.x.organization.assemble.control.Business;
 import com.x.organization.assemble.control.ThisApplication;
 import com.x.organization.assemble.control.message.OrgBodyMessage;
@@ -26,12 +29,8 @@ import com.x.organization.assemble.control.message.OrgMessage;
 import com.x.organization.assemble.control.message.OrgMessageFactory;
 import com.x.organization.core.entity.Identity;
 import com.x.organization.core.entity.Person;
-import com.x.organization.core.entity.Unit;
-import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
 
 class ActionEdit extends BaseAction {
 	private static Logger logger = LoggerFactory.getLogger(ActionEdit.class);
@@ -53,7 +52,8 @@ class ActionEdit extends BaseAction {
 				isNameUpdate = true;
 			}
 			Wi.copier.copy(wi, person);
-
+			// 防止创建的时候加了空格
+			person.setName(StringUtils.trim(person.getName()));
 			this.checkName(business, person.getName(), person.getId());
 			this.checkMobile(business, person.getMobile(), person.getId());
 			this.checkEmployee(business, person.getEmployee(), person.getId());
@@ -103,8 +103,6 @@ class ActionEdit extends BaseAction {
 			business.instrument().collect().person();
 
 			/** 创建 组织变更org消息通信 */
-			// createMessageCommunicate(strOriginalPerson,person, effectivePerson);
-
 			OrgMessageFactory orgMessageFactory = new OrgMessageFactory();
 			orgMessageFactory.createMessageCommunicate("modfiy", "person", strOriginalPerson, person, effectivePerson);