修改bug

parent 7a148c8b
...@@ -547,8 +547,12 @@ public class InnerController implements IBaseController { ...@@ -547,8 +547,12 @@ public class InnerController implements IBaseController {
}else{ }else{
bean.setEducationEnum(extInfo.getEducationEnum().getName()); bean.setEducationEnum(extInfo.getEducationEnum().getName());
} }
if(null==extInfo.getOccupationEnum()){
bean.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.UNKNOWN.getName());
}else{
bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
}
bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
if(null==extInfo.getMarryStatus()){ if(null==extInfo.getMarryStatus()){
bean.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN.getDescription()); bean.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN.getDescription());
}else{ }else{
...@@ -590,9 +594,22 @@ public class InnerController implements IBaseController { ...@@ -590,9 +594,22 @@ public class InnerController implements IBaseController {
bean.setProvince(address.getProvince()); bean.setProvince(address.getProvince());
} }
if (null != extInfo) { if (null != extInfo) {
bean.setEducationEnum(extInfo.getEducationEnum().getName()); if(null==extInfo.getEducationEnum()){
bean.setOccupationEnum(extInfo.getOccupationEnum().getName()); bean.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.UNKNOWN.getName());
bean.setMarryStatus(extInfo.getMarryStatus().getDescription()); }else{
bean.setEducationEnum(extInfo.getEducationEnum().getName());
}
if(null==extInfo.getOccupationEnum()){
bean.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.UNKNOWN.getName());
}else{
bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
}
if(null==extInfo.getMarryStatus()){
bean.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN.getDescription());
}else{
bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
}
} }
if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) { if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
List<XContactInfo> userContacts = contacts2ContactRets(contacts); List<XContactInfo> userContacts = contacts2ContactRets(contacts);
......
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