Commit 140df5d7 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14

parents 17076e38 cb365522
......@@ -3209,14 +3209,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if(Common.isNotNull(basicInfo.getEmpIdCard())){
// 赋值紧急联系人信息
if(Common.isNotNull(contactMap.get(basicInfo.getEmpIdCard()))){
if(Common.isNotNull(contactMap) && Common.isNotNull(contactMap.get(basicInfo.getEmpIdCard()))){
TEmpContactInfo contactInfo = contactMap.get(basicInfo.getEmpIdCard());
basicInfo.setEmergencyContactName(contactInfo.getEmpName());
basicInfo.setEmergencyContactRelation(contactInfo.getRelationType());
basicInfo.setEmergencyContactPhone(contactInfo.getTel());
}
// 赋值社保户
if(Common.isNotNull(socialFundMap.get(basicInfo.getEmpIdCard()))){
if(Common.isNotNull(socialFundMap) && Common.isNotNull(socialFundMap.get(basicInfo.getEmpIdCard()))){
basicInfo.setSocialHouseholdName(socialFundMap.get(basicInfo.getEmpIdCard()));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment