|
@@ -352,16 +352,26 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
|
|
|
}
|
|
|
String roleNames = hasRoles.stream().map(RoleTypeEnum::getDesc).collect(Collectors.joining(","));
|
|
|
userArchivesImportDto.setRoleNames(roleNames);
|
|
|
- userArchivesImportDto.setGender(userArchivesImportDto.getGenderEnum().getTitle());
|
|
|
- userArchivesImportDto.setEducation(userArchivesImportDto.getEducationEnum().getTitle());
|
|
|
+ GenderEnum gender = userArchivesImportDto.getGenderEnum();
|
|
|
+ if (Objects.nonNull(gender)){
|
|
|
+ userArchivesImportDto.setGender(gender.getTitle());
|
|
|
+ }
|
|
|
+ EducationEnum education = userArchivesImportDto.getEducationEnum();
|
|
|
+ if (Objects.nonNull(education)){
|
|
|
+ userArchivesImportDto.setEducation(education.getTitle());
|
|
|
+ }
|
|
|
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
|
|
|
Long archivesTime = userArchivesImportDto.getArchivesTime();
|
|
|
Long authenticationValidTime = userArchivesImportDto.getAuthenticationValidTime();
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
|
|
|
- String archivesTimeStr = sdf.format(new Date(archivesTime));
|
|
|
- String authenticationValidTimeStr = sdf.format(new Date(authenticationValidTime));
|
|
|
- userArchivesImportDto.setArchivesTimeStr(archivesTimeStr);
|
|
|
- userArchivesImportDto.setAuthenticationValidTimeStr(authenticationValidTimeStr);
|
|
|
+ if (Objects.nonNull(archivesTime)){
|
|
|
+ String archivesTimeStr = sdf.format(new Date(archivesTime));
|
|
|
+ userArchivesImportDto.setArchivesTimeStr(archivesTimeStr);
|
|
|
+ }
|
|
|
+ if (Objects.nonNull(authenticationValidTime)){
|
|
|
+ String authenticationValidTimeStr = sdf.format(new Date(authenticationValidTime));
|
|
|
+ userArchivesImportDto.setAuthenticationValidTimeStr(authenticationValidTimeStr);
|
|
|
+ }
|
|
|
}
|
|
|
return userArchivesImportDtoList;
|
|
|
}
|