|
|
@@ -363,8 +363,8 @@ public class JobUserController {
|
|
|
|
|
|
String sexN ="";
|
|
|
|
|
|
- if(StringUtils.isNotEmpty(jobUser.getSex())){
|
|
|
- sexN = dataDictionaryService.getName(resume.getSex());
|
|
|
+ if(StringUtils.isNotEmpty(resume.getSex())){
|
|
|
+ sexN = dataDictionaryService.findNameByCatalogNameAndValue("性别",resume.getSex());
|
|
|
}
|
|
|
dto.setSexN(sexN);
|
|
|
|
|
|
@@ -373,14 +373,14 @@ public class JobUserController {
|
|
|
if(StringUtils.isNotEmpty(jobUser.getIdCard())){
|
|
|
age = IdcardUtil.getAgeByIdCard(jobUser.getIdCard());
|
|
|
}
|
|
|
+ String birthday="";
|
|
|
|
|
|
+ if(resume.getBirthday()!=null){
|
|
|
+ birthday = sdf.format(resume.getBirthday());
|
|
|
+ }
|
|
|
dto.setAge(age);
|
|
|
|
|
|
- String birthday="";
|
|
|
|
|
|
- if(jobUser.getBirthday()!=null){
|
|
|
- birthday = sdf.format(jobUser.getBirthday());
|
|
|
- }
|
|
|
dto.setBirthday(birthday);
|
|
|
|
|
|
String positionCategoryName="";
|
|
|
@@ -407,7 +407,7 @@ public class JobUserController {
|
|
|
workExpName = dataDictionary.getName();
|
|
|
}
|
|
|
dto.setWorkExpName(workExpName);
|
|
|
- dto.setTel(resume.getUserTel());
|
|
|
+ dto.setTel(jobUser.getTel());
|
|
|
dto.setAddress(jobUser.getAddress());
|
|
|
dto.setCurCompany("");
|
|
|
|