fix

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

@@ -80,9 +80,9 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String personId = userNode.get("personIdExternal").asText().trim();// 员工号
-				String dateOfBirth = userNode.get("dateOfBirth").asText().trim();// 出生日期
-				String placeOfBirth = userNode.get("placeOfBirth").asText().trim();// 籍贯
+				String personId = JsonNodeUtil.getValue(userNode, "personIdExternal");// 员工号
+				String dateOfBirth = JsonNodeUtil.getValue(userNode, "dateOfBirth");// 出生日期
+				String placeOfBirth = JsonNodeUtil.getValue(userNode, "placeOfBirth");// 籍贯
 				String education = JsonNodeUtil.getValue(userNode, "customString1Nav", "externalCode");// 最高学历
 				SapPerPerson entity = SapPerPerson.builder().personId(personId).dateOfBirth(dateOfBirth)
 						.placeOfBirth(placeOfBirth).education(education).build();
@@ -102,18 +102,18 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String personId = userNode.get("personIdExternal").asText().trim();
-				String firstName = userNode.get("firstName").asText().trim();// 名字
-				String lastName = userNode.get("lastName").asText().trim();// 姓氏
-				String displayName = userNode.get("displayName").asText().trim();// 英文全名
-				String formalName = userNode.get("formalName").asText().trim();// 全名
-				String nationality = userNode.get("nationality").asText().trim();// 国籍
-				String gender = userNode.get("gender").asText().trim();// 性别
+				String personId = JsonNodeUtil.getValue(userNode, "personIdExternal");
+				String firstName = JsonNodeUtil.getValue(userNode, "firstName");// 名字
+				String lastName = JsonNodeUtil.getValue(userNode, "lastName");// 姓氏
+				String displayName = JsonNodeUtil.getValue(userNode, "displayName");// 英文全名
+				String formalName = JsonNodeUtil.getValue(userNode, "formalName");// 全名
+				String nationality = JsonNodeUtil.getValue(userNode, "nationality");// 国籍
+				String gender = JsonNodeUtil.getValue(userNode, "gender");// 性别
 				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();// 拼音名
-				String lastNameAlt2 = userNode.get("lastNameAlt2").asText().trim();// 拼音姓
+				String firstNameAlt1 = JsonNodeUtil.getValue(userNode, "firstNameAlt1");// 英文名
+				String lastNameAlt1 = JsonNodeUtil.getValue(userNode, "lastNameAlt1");// 英文姓
+				String firstNameAlt2 = JsonNodeUtil.getValue(userNode, "firstNameAlt2");// 拼音名
+				String lastNameAlt2 = JsonNodeUtil.getValue(userNode, "lastNameAlt2");// 拼音姓
 				SapPerPersonal entity = SapPerPersonal.builder().personId(personId).firstName(firstName)
 						.lastName(lastName).displayName(displayName).formalName(formalName).nationality(nationality)
 						.gender(gender).maritalStatusCode(maritalStatusCode).firstNameAlt1(firstNameAlt1)
@@ -134,12 +134,12 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String personId = userNode.get("personIdExternal").asText().trim();
+				String personId = JsonNodeUtil.getValue(userNode, "personIdExternal");
 				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();// 社保所在地
+				String orgRelationshipLocation = JsonNodeUtil.getValue(userNode, "customString1");// 组织关系所在地
+				String socialSecurityLocation = JsonNodeUtil.getValue(userNode, "customString2");// 社保所在地
 				SapPerGlobalInfoCHN entity = SapPerGlobalInfoCHN.builder().personId(personId)
 						.householdRegistrationType(householdRegistrationType).nation(nation)
 						.politicalOutlook(politicalOutlook).orgRelationshipLocation(orgRelationshipLocation)
@@ -160,10 +160,10 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String personId = userNode.get("personIdExternal").asText().trim();
-				String countryName = userNode.get("countryNav").get("territoryName").asText().trim();// 国家/地区
-				String cardType = userNode.get("cardType").asText().trim();// 国民身份证类型
-				String nationalId = userNode.get("nationalId").asText().trim();// 国民身份证
+				String personId = JsonNodeUtil.getValue(userNode, "personIdExternal");
+				String countryName = JsonNodeUtil.getValue(userNode, "countryNav", "territoryName");// 国家/地区
+				String cardType = JsonNodeUtil.getValue(userNode, "cardType");// 国民身份证类型
+				String nationalId = JsonNodeUtil.getValue(userNode, "nationalId");// 国民身份证
 				SapPerNationalId entity = SapPerNationalId.builder().personId(personId).countryName(countryName)
 						.cardType(cardType).nationalId(nationalId).build();
 				save("SapReportMapper.saveSapPerNationalId", entity);
@@ -182,10 +182,10 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String personId = userNode.get("personIdExternal").asText().trim();
-				String emailTypeCode = userNode.get("emailTypeNav").get("externalCode").asText().trim();// 电子邮件类型
-				String emailAddress = userNode.get("emailAddress").asText().trim();// 电子邮件地址
-				String isPrimary = userNode.get("isPrimary").asText().trim();// 主要
+				String personId = JsonNodeUtil.getValue(userNode, "personIdExternal");
+				String emailTypeCode = JsonNodeUtil.getValue(userNode, "emailTypeNav", "externalCode");// 电子邮件类型
+				String emailAddress = JsonNodeUtil.getValue(userNode, "emailAddress");// 电子邮件地址
+				String isPrimary = JsonNodeUtil.getValue(userNode, "isPrimary");// 主要
 				SapPerEmail entity = SapPerEmail.builder().personId(personId).emailTypeCode(emailTypeCode)
 						.emailAddress(emailAddress).isPrimary(isPrimary).build();
 				save("SapReportMapper.saveSapPerEmail", entity);
@@ -205,10 +205,10 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String personId = userNode.get("personIdExternal").asText().trim();
-				String phoneTypeCode = userNode.get("phoneTypeNav").get("externalCode").asText().trim();// 电话类型
-				String phoneNumber = userNode.get("phoneNumber").asText().trim();// 电话号码
-				String isPrimary = userNode.get("isPrimary").asText().trim();// 主要
+				String personId = JsonNodeUtil.getValue(userNode, "personIdExternal");
+				String phoneTypeCode = JsonNodeUtil.getValue(userNode, "phoneTypeNav", "externalCode");// 电话类型
+				String phoneNumber = JsonNodeUtil.getValue(userNode, "phoneNumber");// 电话号码
+				String isPrimary = JsonNodeUtil.getValue(userNode, "isPrimary");// 主要
 				SapPerPhone entity = SapPerPhone.builder().personId(personId).phoneNumber(phoneNumber)
 						.phoneTypeCode(phoneTypeCode).isPrimary(isPrimary).build();
 				save("SapReportMapper.saveSapPerPhone", entity);
@@ -227,9 +227,9 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String personId = userNode.get("personIdExternal").asText().trim();
-				String domainCode = userNode.get("domainNav").get("externalCode").asText().trim();// 微信
-				String imId = userNode.get("imId").asText().trim();// 微信号
+				String personId = JsonNodeUtil.getValue(userNode, "personIdExternal");
+				String domainCode = JsonNodeUtil.getValue(userNode, "domainNav", "externalCode");// 微信
+				String imId = JsonNodeUtil.getValue(userNode, "imId");// 微信号
 				SapPerSocialAccount entity = SapPerSocialAccount.builder().personId(personId).domainCode(domainCode)
 						.imId(imId).build();
 				save("SapReportMapper.saveSapPerSocialAccount", entity);
@@ -248,17 +248,17 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String personId = userNode.get("personIdExternal").asText().trim();
-				String startDate = userNode.get("startDate").asText().trim();// 最近一次入职日期
-				String firstDateWorked = userNode.get("firstDateWorked").asText().trim();// 首次工作日期
-				String originalStartDate = userNode.get("originalStartDate").asText().trim();// 进入集团日期
-				String seniorityDate = userNode.get("seniorityDate").asText().trim();// 司龄起始日期
-				String socialServiceAge = userNode.get("customDouble1").asText().trim();// 社会工龄
-				String seniority = userNode.get("customDouble2").asText().trim();// 司龄（最近入职）
-				String endDate = userNode.get("endDate").asText().trim();// 离职日期
-				String okToRehire = userNode.get("okToRehire").asText().trim();// 可以再雇佣
-				String salaryEndDate = userNode.get("salaryEndDate").asText().trim();// 最后结薪日期
-				String benefitsEndDate = userNode.get("benefitsEndDate").asText().trim();// 福利结算日期
+				String personId = JsonNodeUtil.getValue(userNode, "personIdExternal");
+				String startDate = JsonNodeUtil.getValue(userNode, "startDate");// 最近一次入职日期
+				String firstDateWorked = JsonNodeUtil.getValue(userNode, "firstDateWorked");// 首次工作日期
+				String originalStartDate = JsonNodeUtil.getValue(userNode, "originalStartDate");// 进入集团日期
+				String seniorityDate = JsonNodeUtil.getValue(userNode, "seniorityDate");// 司龄起始日期
+				String socialServiceAge = JsonNodeUtil.getValue(userNode, "customDouble1");// 社会工龄
+				String seniority = JsonNodeUtil.getValue(userNode, "customDouble2");// 司龄（最近入职）
+				String endDate = JsonNodeUtil.getValue(userNode, "endDate");// 离职日期
+				String okToRehire = JsonNodeUtil.getValue(userNode, "okToRehire");// 可以再雇佣
+				String salaryEndDate = JsonNodeUtil.getValue(userNode, "salaryEndDate");// 最后结薪日期
+				String benefitsEndDate = JsonNodeUtil.getValue(userNode, "benefitsEndDate");// 福利结算日期
 				String leavingReasonCode = JsonNodeUtil.getValue(userNode, "customString16Nav", "externalCode");// 离职详细原因
 				SapEmpEmployment entity = SapEmpEmployment.builder().personId(personId).startDate(startDate)
 						.firstDateWorked(firstDateWorked).originalStartDate(originalStartDate)
@@ -282,9 +282,9 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
 				String positionName = JsonNodeUtil.getValue(userNode, "positionNav", "externalName_zh_CN");// 职位
-				String positionEntryDate = userNode.get("positionEntryDate").asText().trim();// 就职日期
+				String positionEntryDate = JsonNodeUtil.getValue(userNode, "positionEntryDate");// 就职日期
 				// TODO 在职时间
 				String companyName = JsonNodeUtil.getValue(userNode, "companyNav", "name");// 公司
 				String businessUnitName = JsonNodeUtil.getValue(userNode, "businessUnitNav", "name");// 业务单元
@@ -292,9 +292,9 @@ public class SapReportService extends BaseService {
 				String departmentName = JsonNodeUtil.getValue(userNode, "departmentNav", "name");// 团队
 				String teamName = JsonNodeUtil.getValue(userNode, "customString19Nav", "externalName_zh_CN");// 小组
 				String locationName = JsonNodeUtil.getValue(userNode, "locationNav", "name");// 工作地点
-				String managerId = userNode.get("managerId").asText().trim();// 直线经理
+				String managerId = JsonNodeUtil.getValue(userNode, "managerId");// 直线经理
 				String jobCodeName = JsonNodeUtil.getValue(userNode, "jobCodeNav", "name");// 职务分类
-				String jobTitle = userNode.get("jobTitle").asText().trim();// 标准职务名称
+				String jobTitle = JsonNodeUtil.getValue(userNode, "jobTitle");// 标准职务名称
 				// TODO 员工性质
 				String rank = JsonNodeUtil.getValue(userNode, "customString2Nav", "externalCode");// 职级
 				String managementOrNot = JsonNodeUtil.getValue(userNode, "customString4Nav", "externalCode");// 是否管理层
@@ -319,7 +319,7 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
 				String relationshipTypeCode = JsonNodeUtil.getValue(userNode, "relationshipTypeNav", "externalCode");// 关系类型
 				String relUserName = JsonNodeUtil.getValue(userNode, "relUserNav", "lastName")
 						+ JsonNodeUtil.getValue(userNode, "relUserNav", "firstName");// 姓名
@@ -341,16 +341,16 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
-				String startDate = userNode.get("startDate").asText().trim(); // 开始日期
-				String endDate = userNode.get("endDate").asText().trim();// 结束日期
-				String employer = userNode.get("employer").asText().trim();// 曾工作公司名称
-				String businessType = userNode.get("businessType").asText().trim();// 公司所在地
-				String department = userNode.get("startTitle").asText().trim();// 所在部门
-				String position = userNode.get("custom1").asText().trim();// 职位
-				String leavingReason = userNode.get("custom2").asText().trim();// 离职原因
-				String immediateSupervisorName = userNode.get("custom3").asText().trim();// 直接上司姓名
-				String contactInformation = userNode.get("custom4").asText().trim();// 联系方式
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
+				String startDate = JsonNodeUtil.getValue(userNode, "startDate"); // 开始日期
+				String endDate = JsonNodeUtil.getValue(userNode, "endDate");// 结束日期
+				String employer = JsonNodeUtil.getValue(userNode, "employer");// 曾工作公司名称
+				String businessType = JsonNodeUtil.getValue(userNode, "businessType");// 公司所在地
+				String department = JsonNodeUtil.getValue(userNode, "startTitle");// 所在部门
+				String position = JsonNodeUtil.getValue(userNode, "custom1");// 职位
+				String leavingReason = JsonNodeUtil.getValue(userNode, "custom2");// 离职原因
+				String immediateSupervisorName = JsonNodeUtil.getValue(userNode, "custom3");// 直接上司姓名
+				String contactInformation = JsonNodeUtil.getValue(userNode, "custom4");// 联系方式
 				SapOutsideWorkExperience entity = SapOutsideWorkExperience.builder().userId(userId).startDate(startDate)
 						.endDate(endDate).employer(employer).businessType(businessType).department(department)
 						.position(position).leavingReason(leavingReason)
@@ -370,11 +370,11 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
-				String startDate = userNode.get("startDate").asText().trim();// 开始日期
-				String endDate = userNode.get("endDate").asText().trim();// 结束日期
-				String title = userNode.get("title").asText().trim();// 职务
-				String department = userNode.get("department").asText().trim();// 部门
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
+				String startDate = JsonNodeUtil.getValue(userNode, "startDate");// 开始日期
+				String endDate = JsonNodeUtil.getValue(userNode, "endDate");// 结束日期
+				String title = JsonNodeUtil.getValue(userNode, "title");// 职务
+				String department = JsonNodeUtil.getValue(userNode, "department");// 部门
 				SapInsideWorkExperience entity = SapInsideWorkExperience.builder().userId(userId).startDate(startDate)
 						.endDate(endDate).title(title).department(department).build();
 				save("SapReportMapper.saveSapInsideWorkExperience", entity);
@@ -391,17 +391,17 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
-				String course = userNode.get("course").asText().trim();// 课程名称
-				String institution = userNode.get("institution").asText().trim();// 开始日期
-				String instructionType = userNode.get("instructionType").asText().trim();// 结束日期
-				String lengthCode = userNode.get("lengthNav").get("externalCode").asText().trim();// 培训类型
-				String place = userNode.get("custom9").asText().trim();// 培训地点
-				String duration = userNode.get("custom1").asText().trim();// 历时
-				String result = userNode.get("custom2").asText().trim();// 培训结果
-				String certificateOrNot = userNode.get("custom3Nav").get("externalCode").asText().trim();// 是否有证书
-				String dueTime = userNode.get("custom4").asText().trim();// 培训服务期到期时间
-				String remark = userNode.get("custom7").asText().trim();// 备注
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
+				String course = JsonNodeUtil.getValue(userNode, "course");// 课程名称
+				String institution = JsonNodeUtil.getValue(userNode, "institution");// 开始日期
+				String instructionType = JsonNodeUtil.getValue(userNode, "instructionType");// 结束日期
+				String lengthCode = JsonNodeUtil.getValue(userNode, "lengthNav", "externalCode");// 培训类型
+				String place = JsonNodeUtil.getValue(userNode, "custom9");// 培训地点
+				String duration = JsonNodeUtil.getValue(userNode, "custom1");// 历时
+				String result = JsonNodeUtil.getValue(userNode, "custom2");// 培训结果
+				String certificateOrNot = JsonNodeUtil.getValue(userNode, "custom3Nav", "externalCode");// 是否有证书
+				String dueTime = JsonNodeUtil.getValue(userNode, "custom4");// 培训服务期到期时间
+				String remark = JsonNodeUtil.getValue(userNode, "custom7");// 备注
 				SapCourses entity = SapCourses.builder().userId(userId).course(course).institution(institution)
 						.instructionType(instructionType).lengthCode(lengthCode).place(place).duration(duration)
 						.result(result).certificateOrNot(certificateOrNot).dueTime(dueTime).remark(remark).build();
@@ -419,13 +419,13 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
-				String startDate = userNode.get("startDate").asText().trim();// 开始日期
-				String endDate = userNode.get("endDate").asText().trim();// 结束日期
-				String school = userNode.get("school").asText().trim();// 院校
-				String major = userNode.get("major").asText().trim();// 专业
-				String degree = userNode.get("degree").asText().trim();// 学历
-				String qualification = userNode.get("custom1").asText().trim();// 学位
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
+				String startDate = JsonNodeUtil.getValue(userNode, "startDate");// 开始日期
+				String endDate = JsonNodeUtil.getValue(userNode, "endDate");// 结束日期
+				String school = JsonNodeUtil.getValue(userNode, "school");// 院校
+				String major = JsonNodeUtil.getValue(userNode, "major");// 专业
+				String degree = JsonNodeUtil.getValue(userNode, "degree");// 学历
+				String qualification = JsonNodeUtil.getValue(userNode, "custom1");// 学位
 				SapEducation entity = SapEducation.builder().userId(userId).startDate(startDate).endDate(endDate)
 						.school(school).major(major).degree(degree).qualification(qualification).build();
 				save("SapReportMapper.saveSapEducation", entity);
@@ -444,12 +444,12 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
-				String name = userNode.get("name").asText().trim();// 证书/执照
-				String description = userNode.get("description").asText().trim();// 描述
-				String institution = userNode.get("institution").asText().trim();// 证书颁发机构
-				String startDate = userNode.get("startDate").asText().trim();// 证书颁发日期
-				String endDate = userNode.get("endDate").asText().trim();// 证书到期日期
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
+				String name = JsonNodeUtil.getValue(userNode, "name");// 证书/执照
+				String description = JsonNodeUtil.getValue(userNode, "description");// 描述
+				String institution = JsonNodeUtil.getValue(userNode, "institution");// 证书颁发机构
+				String startDate = JsonNodeUtil.getValue(userNode, "startDate");// 证书颁发日期
+				String endDate = JsonNodeUtil.getValue(userNode, "endDate");// 证书到期日期
 				SapCertificates entity = SapCertificates.builder().userId(userId).name(name).description(description)
 						.institution(institution).startDate(startDate).endDate(endDate).build();
 				save("SapReportMapper.saveSapCertificates", entity);
@@ -468,11 +468,11 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
-				String languageCode = userNode.get("languageNav").get("externalCode").asText().trim();// 语言
-				String speakingProfCode = userNode.get("speakingProfNav").asText().trim();// 口语能力
-				String readingProfCode = userNode.get("readingProfNav").asText().trim();// 阅读能力
-				String writingProfCode = userNode.get("writingProfNav").asText().trim();// 书写能力
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
+				String languageCode = JsonNodeUtil.getValue(userNode, "languageNav", "externalCode");// 语言
+				String speakingProfCode = JsonNodeUtil.getValue(userNode, "speakingProfNav");// 口语能力
+				String readingProfCode = JsonNodeUtil.getValue(userNode, "readingProfNav");// 阅读能力
+				String writingProfCode = JsonNodeUtil.getValue(userNode, "writingProfNav");// 书写能力
 				SapLanguages entity = SapLanguages.builder().userId(userId).languageCode(languageCode)
 						.speakingProfCode(speakingProfCode).readingProfCode(readingProfCode)
 						.writingProfCode(writingProfCode).build();
@@ -492,12 +492,12 @@ public class SapReportService extends BaseService {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
 			while (iterator.hasNext()) {
 				JsonNode userNode = iterator.next();
-				String userId = userNode.get("userId").asText().trim();
-				String startDate = userNode.get("startDate").asText().trim(); // 起始日期
-				String endDate = userNode.get("endDate").asText().trim();// 结束日期
-				String module = userNode.get("module").asText().trim(); // 模块
-				String name = userNode.get("name").asText().trim(); // 名称
-				String description = userNode.get("description").asText().trim();// 描述
+				String userId = JsonNodeUtil.getValue(userNode, "userId");
+				String startDate = JsonNodeUtil.getValue(userNode, "startDate"); // 起始日期
+				String endDate = JsonNodeUtil.getValue(userNode, "endDate");// 结束日期
+				String module = JsonNodeUtil.getValue(userNode, "module"); // 模块
+				String name = JsonNodeUtil.getValue(userNode, "name"); // 名称
+				String description = JsonNodeUtil.getValue(userNode, "description");// 描述
 				SapOverallPerformance entity = SapOverallPerformance.builder().userId(userId).startDate(startDate)
 						.endDate(endDate).module(module).name(name).description(description).build();
 				save("SapReportMapper.saveSapOverallPerformance", entity);