fix

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapReportMapper.xml

@@ -49,7 +49,7 @@
 	
 	<insert id="saveSapPerEmail">
 		insert into sapperemail(personId,emailTypeCode,emailAddress,isPrimary) 
-		values (#{personId},#{emailTypeCode},#{emailAddress}#{isPrimary})
+		values (#{personId},#{emailTypeCode},#{emailAddress},#{isPrimary})
 	</insert>
 	
 	<delete id="deleteSapPerPhone">
@@ -57,8 +57,8 @@
 	</delete>
 	
 	<insert id="saveSapPerPhone">
-		insert into sapperphone(personId) 
-		values (#{personId})
+		insert into sapperphone(personId,phoneNumber,phoneTypeCode,isPrimary) 
+		values (#{personId},#{phoneNumber},#{phoneTypeCode},#{isPrimary})
 	</insert>
 	
 	<delete id="deleteSapPerSocialAccount">

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

@@ -50,16 +50,16 @@ public class SapReportService extends BaseService {
 			personIds += "'" + sapUser.getPersonId() + "',";
 			userIds += "'" + sapUser.getUserId() + "',";
 		}
-//		this.saveSapCertificates(headers, userIds);
-//		this.saveSapCourses(headers, userIds);
-//		this.saveSapEducation(headers, userIds);
-//		this.saveSapInsideWorkExperience(headers, userIds);
-//		this.saveSapLanguages(headers, personIds, userIds);
-//		this.saveSapOverallPerformance(headers, userIds);
-//		this.saveSapEmpJob(headers, userIds);
-//		this.saveSapOutsideWorkExperience(headers, userIds);
-//		this.saveSapEmpEmployment(headers, personIds);
-//		this.saveSapEmpJobRelationships(headers, userIds);
+		this.saveSapCertificates(headers, userIds);
+		this.saveSapCourses(headers, userIds);
+		this.saveSapEducation(headers, userIds);
+		this.saveSapInsideWorkExperience(headers, userIds);
+		this.saveSapLanguages(headers, personIds, userIds);
+		this.saveSapOverallPerformance(headers, userIds);
+		this.saveSapEmpJob(headers, userIds);
+		this.saveSapOutsideWorkExperience(headers, userIds);
+		this.saveSapEmpEmployment(headers, personIds);
+		this.saveSapEmpJobRelationships(headers, userIds);
 		this.saveSapPerEmail(headers, personIds, userIds);
 		this.saveSapPerGlobalInfoCHN(headers, personIds, userIds);
 		this.saveSapPerNationalId(headers, personIds, userIds);
@@ -72,7 +72,7 @@ public class SapReportService extends BaseService {
 // 基本信息	PerPerson,PerPersonal
 	public void saveSapPerPerson(HttpHeaders headers, String personIds, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerPerson", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/PerPerson?$filter=personIdExternal in %s&$format=json&$expand=customString1Nav";
 		url = String.format(url, personIds);
 		JsonNode node = requestService.getForObject(url, headers);
@@ -83,7 +83,7 @@ public class SapReportService extends BaseService {
 				String personId = userNode.get("personIdExternal").asText().trim();// 员工号
 				String dateOfBirth = userNode.get("dateOfBirth").asText().trim();// 出生日期
 				String placeOfBirth = userNode.get("placeOfBirth").asText().trim();// 籍贯
-				String education = userNode.get("customString1Nav").get("externalCode").asText().trim();// 最高学历
+				String education = JsonNodeUtil.getValue(userNode, "customString1Nav", "externalCode");// 最高学历
 				SapPerPerson entity = SapPerPerson.builder().personId(personId).dateOfBirth(dateOfBirth)
 						.placeOfBirth(placeOfBirth).education(education).build();
 				save("SapReportMapper.saveSapPerPerson", entity);
@@ -94,7 +94,7 @@ public class SapReportService extends BaseService {
 // 基本信息	PerPerson,PerPersonal
 	public void saveSapPerPersonal(HttpHeaders headers, String personIds, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerPersonal", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/PerPersonal?$filter=personIdExternal in %s&$format=json&$expand=maritalStatusNav";
 		url = String.format(url, personIds);
 		JsonNode node = requestService.getForObject(url, headers);
@@ -109,7 +109,7 @@ public class SapReportService extends BaseService {
 				String formalName = userNode.get("formalName").asText().trim();// 全名
 				String nationality = userNode.get("nationality").asText().trim();// 国籍
 				String gender = userNode.get("gender").asText().trim();// 性别
-				String maritalStatusCode = userNode.get("maritalStatusNav").get("externalCode").asText().trim();// 婚姻状况
+				String maritalStatusCode = JsonNodeUtil.getValue(userNode, "maritalStatusNav", "externalCode");// 婚姻状况
 				String firstNameAlt1 = userNode.get("firstNameAlt1").asText().trim();// 英文名
 				String lastNameAlt1 = userNode.get("lastNameAlt1").asText().trim();// 英文姓
 				String firstNameAlt2 = userNode.get("firstNameAlt2").asText().trim();// 拼音名
@@ -126,7 +126,7 @@ public class SapReportService extends BaseService {
 // 个人信息	PerGlobalInfoCHN
 	public void saveSapPerGlobalInfoCHN(HttpHeaders headers, String personIds, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerGlobalInfoCHN", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/PerGlobalInfoCHN?$filter=personIdExternal in %s&$format=json";
 		url = String.format(url, personIds);
 		JsonNode node = requestService.getForObject(url, headers);
@@ -135,10 +135,9 @@ public class SapReportService extends BaseService {
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
 				String personId = userNode.get("personIdExternal").asText().trim();
-				String householdRegistrationType = userNode.get("genericNumber1Nav").get("externalCode").asText()
-						.trim();// 户口类型
-				String nation = userNode.get("genericNumber4Nav").get("externalCode").asText().trim();// 民族
-				String politicalOutlook = userNode.get("customString6Nav").get("externalCode").asText().trim();// 政治面貌
+				String householdRegistrationType = JsonNodeUtil.getValue(userNode, "genericNumber1Nav", "externalCode");// 户口类型
+				String nation = JsonNodeUtil.getValue(userNode, "genericNumber4Nav", "externalCode");// 民族
+				String politicalOutlook = JsonNodeUtil.getValue(userNode, "customString6Nav", "externalCode");// 政治面貌
 				String orgRelationshipLocation = userNode.get("customString1").asText().trim();// 组织关系所在地
 				String socialSecurityLocation = userNode.get("customString2").asText().trim();// 社保所在地
 				SapPerGlobalInfoCHN entity = SapPerGlobalInfoCHN.builder().personId(personId)
@@ -153,7 +152,7 @@ public class SapReportService extends BaseService {
 // 国家身份信息	PerNationalId
 	public void saveSapPerNationalId(HttpHeaders headers, String personIds, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerNationalId", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/PerNationalId?$filter=personIdExternal in %s&$format=json&$expand=countryNav";
 		url = String.format(url, personIds);
 		JsonNode node = requestService.getForObject(url, headers);
@@ -175,7 +174,7 @@ public class SapReportService extends BaseService {
 // 邮件信息	PerEmail
 	public void saveSapPerEmail(HttpHeaders headers, String personIds, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerEmail", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/PerEmail?$filter=personIdExternal in %s&$format=json&$expand=emailTypeNav";
 		url = String.format(url, personIds);
 		JsonNode node = requestService.getForObject(url, headers);
@@ -198,7 +197,7 @@ public class SapReportService extends BaseService {
 // 通讯信息	PerPhone
 	public void saveSapPerPhone(HttpHeaders headers, String personIds, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerPhone", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/PerPhone?$filter=personIdExternal in %s&$format=json&$expand=phoneTypeNav";
 		url = String.format(url, personIds);
 		JsonNode node = requestService.getForObject(url, headers);
@@ -220,7 +219,7 @@ public class SapReportService extends BaseService {
 // 社交账号	PerSocialAccount
 	public void saveSapPerSocialAccount(HttpHeaders headers, String personIds, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapPerSocialAccount", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/PerSocialAccount?$filter=personIdExternal in %s&$format=json&$expand=domainNav";
 		url = String.format(url, personIds);
 		JsonNode node = requestService.getForObject(url, headers);
@@ -241,7 +240,7 @@ public class SapReportService extends BaseService {
 // 雇佣详细信息	EmpEmployment
 	public void saveSapEmpEmployment(HttpHeaders headers, String personIds) throws Exception {
 		delete("SapReportMapper.deleteSapEmpEmployment", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/EmpEmployment?$filter=personIdExternal in %s&$format=json";
 		url = String.format(url, personIds);
 		JsonNode node = requestService.getForObject(url, headers);
@@ -274,7 +273,7 @@ public class SapReportService extends BaseService {
 	// 组织以及职位信息 EmpJob
 	public void saveSapEmpJob(HttpHeaders headers, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapEmpJob", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/EmpJob?$filter=userId in %s&$format=json"
 				+ "&$expand=positionNav,companyNav,divisionNav,departmentNav,customString19Nav,locationNav,jobCodeNav,customString2Nav,customString4Nav";
 		url = String.format(url, userIds);
@@ -312,7 +311,7 @@ public class SapReportService extends BaseService {
 	// 工作关系 EmpJobRelationships
 	public void saveSapEmpJobRelationships(HttpHeaders headers, String userIds) throws Exception {
 		delete("SapReportMapper.deleteSapEmpJobRelationships", null);
-		
+
 		String url = "https://api15.sapsf.cn/odata/v2/EmpJobRelationships?$filter=userId in %s&$format=json&$expand=relationshipTypeNav,relUserNav";
 		url = String.format(url, userIds);
 		JsonNode node = requestService.getForObject(url, headers);