fix

code/sapparent/sapservice/src/main/java/org/fouram/core/base/service/BaseService.java

@@ -7,6 +7,7 @@ import javax.annotation.Resource;
 import org.fouram.core.base.dao.DAO;
 import org.fouram.core.util.Base64Util;
 import org.fouram.core.util.ConfConfig;
+import org.fouram.core.util.Tools;
 import org.fouram.entity.SapUser;
 import org.springframework.http.HttpHeaders;
 
@@ -69,4 +70,23 @@ public abstract class BaseService {
 		}
 		return userIds;
 	}
+	
+	public static String formatPosition(String position) {
+		if(Tools.isEmpty(position)) {
+			return "";
+		}
+		position = position.replace("\n", "");
+		return position;
+	}
+	
+	public static String formatBusinessPhone(String businessPhone) {
+		if(Tools.isEmpty(businessPhone)) {
+			return "";
+		}
+		// 021 80171999 -> 021-80171999
+		if(businessPhone.length() == 12) {
+			businessPhone = businessPhone.replace(" ", "-");
+		}
+		return businessPhone;
+	}
 }

code/sapparent/sapservice/src/main/java/org/fouram/service/SapEmpJobService.java

@@ -36,7 +36,7 @@ public class SapEmpJobService extends BaseService {
 		}
 		for(SapUser sapUser : sapUsers) {
 			sapUser.setPosition(jobTitleMap.get(sapUser.getUserId()));
-			sapUser.setFormatPosition(sapUser.getPosition());
+			sapUser.setFormatPosition(formatPosition(sapUser.getPosition()));
 		}
 	}
 }

code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -64,7 +64,7 @@ public class SapUserService extends BaseService {
 					}
 					SapUser sapUser = SapUser.builder().userId(userId).personId(personId).username(username).name(name)
 							.mobile(mobile).formatMobile(mobile).businessPhone(businessPhone)
-							.formatBusinessPhone(businessPhone).email(email).formatEmail(email)
+							.formatBusinessPhone(formatBusinessPhone(businessPhone)).email(email).formatEmail(email)
 							.isPrimary(userId.equals(personId)).build();
 					sapUsers.add(sapUser);
 				}