liupeng 4 tahun lalu
induk
melakukan
c5f10c0cd4

+ 4 - 0
code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapPerPersonRelationshipMapper.xml

@@ -12,5 +12,9 @@
 		values (#{personId},#{relatedPersonId},
 			#{lastName},#{firstName},#{relationshipType},#{relationshipTypeName},#{dateOfBirth})
 	</insert>
+	
+	<select id="findListByPersonId" resultType="SapPerPersonRelationship">
+		select * from sap_per_person_relationship where personId=#{personId}
+	</select>
 
 </mapper>

+ 3 - 2
code/sapparent/sapservice/src/main/java/org/fouram/service/SapPerPersonRelationshipService.java

@@ -41,7 +41,8 @@ public class SapPerPersonRelationshipService extends BaseService {
 		}
 	}
 
-	public List<SapPerPersonRelationship> findListByPersonId(String personId) {
-		return null;
+	@SuppressWarnings("unchecked")
+	public List<SapPerPersonRelationship> findListByPersonId(String personId) throws Exception {
+		return (List<SapPerPersonRelationship>) findList("SapPerPersonRelationshipMapper.findListByPersonId", personId);
 	}
 }

+ 19 - 7
code/sapparent/sapservice/src/main/java/org/fouram/service/SapUserService.java

@@ -590,17 +590,29 @@ public class SapUserService extends BaseService {
 					.relation(relationship.getRelationshipType()).build();
 			familyList.add(family);
 		}
+		UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().cardId(user.getCardId())
+				.cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode()).email(user.getEmail())
+				.entryDate(user.getStartDate()).jobNumber(user.getJobNumber()).phone(user.getFormatMobile())
+				.resignDate(user.getEndDate()).type(type).username(user.getName()).familyList(familyList).build();
+
 		SapBank sapBank = sapBankService.selectOneByPersonId(user.getPersonId());
+		if (sapBank != null) {
+			reqdata.setAccountBank(sapBank.getNumber());
+			reqdata.setAccountBankName(sapBank.getBank());
+		}
 		SapPerGlobalInfoCHN globalInfo = globalInfoCHNService.selectOneByPersonId(user.getPersonId());
+		if (globalInfo != null) {
+			reqdata.setSocialArea(globalInfo.getSocialSecurityLocation());
+		}
 		SapContract contract = contractService.selectOneByPersonId(user.getPersonId());
+		if (contract != null) {
+			reqdata.setLegalPerson(contract.getLegalName());
+		}
 		SapEmpJob empJob = empJobService.selectOneByPersonId(user.getPersonId());
-		UploadUpdateEmpDTO reqdata = UploadUpdateEmpDTO.builder().accountBank(sapBank.getNumber())
-				.accountBankName(sapBank.getBank()).cardId(user.getCardId())
-				.cardType(CardTypeEnum.getEnumBySapCode(user.getCardType()).getMyCode()).email(user.getEmail())
-				.entryDate(user.getStartDate()).jobNumber(user.getJobNumber()).legalPerson(contract.getLegalName())
-				.phone(user.getFormatMobile()).resignDate(user.getEndDate())
-				.socialArea(globalInfo.getSocialSecurityLocation()).type(type).username(user.getName())
-				.provinceName(empJob.getLocationName()).familyList(familyList).build();
+		if (empJob != null) {
+			reqdata.setProvinceName(empJob.getLocationName());
+		}
+
 		String url = "http://cmcadmin.info666.com/hr/emp/updateEmpInfo";
 		if (!devFlag) {
 			url = "https://manage.inet.cmcinc.cn/hr/emp/updateEmpInfo";