除了个人信息可能为null,导致的map key 不能为null问题
This commit is contained in:
@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
import java.time.Instant;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.IntStream;
|
||||
|
||||
@@ -314,16 +315,11 @@ public class UserProfileService {
|
||||
}
|
||||
|
||||
// 2. 读取简历5张子表
|
||||
List<UserResumeEducation> resumeEducationList = resumeEducationMapper.selectList(
|
||||
new LambdaQueryWrapper<UserResumeEducation>().eq(UserResumeEducation::getResumeId, resumeId).orderByAsc(UserResumeEducation::getSortOrder));
|
||||
List<UserResumeWork> resumeWorkList = resumeWorkMapper.selectList(
|
||||
new LambdaQueryWrapper<UserResumeWork>().eq(UserResumeWork::getResumeId, resumeId).orderByAsc(UserResumeWork::getSortOrder));
|
||||
List<UserResumeInternship> resumeInternshipList = resumeInternshipMapper.selectList(
|
||||
new LambdaQueryWrapper<UserResumeInternship>().eq(UserResumeInternship::getResumeId, resumeId).orderByAsc(UserResumeInternship::getSortOrder));
|
||||
List<UserResumeProject> resumeProjectList = resumeProjectMapper.selectList(
|
||||
new LambdaQueryWrapper<UserResumeProject>().eq(UserResumeProject::getResumeId, resumeId).orderByAsc(UserResumeProject::getSortOrder));
|
||||
List<UserResumeCompetition> resumeCompetitionList = resumeCompetitionMapper.selectList(
|
||||
new LambdaQueryWrapper<UserResumeCompetition>().eq(UserResumeCompetition::getResumeId, resumeId).orderByAsc(UserResumeCompetition::getSortOrder));
|
||||
List<UserResumeEducation> resumeEducationList = resumeEducationMapper.selectList(new LambdaQueryWrapper<UserResumeEducation>().eq(UserResumeEducation::getResumeId, resumeId).orderByAsc(UserResumeEducation::getSortOrder));
|
||||
List<UserResumeWork> resumeWorkList = resumeWorkMapper.selectList(new LambdaQueryWrapper<UserResumeWork>().eq(UserResumeWork::getResumeId, resumeId).orderByAsc(UserResumeWork::getSortOrder));
|
||||
List<UserResumeInternship> resumeInternshipList = resumeInternshipMapper.selectList(new LambdaQueryWrapper<UserResumeInternship>().eq(UserResumeInternship::getResumeId, resumeId).orderByAsc(UserResumeInternship::getSortOrder));
|
||||
List<UserResumeProject> resumeProjectList = resumeProjectMapper.selectList(new LambdaQueryWrapper<UserResumeProject>().eq(UserResumeProject::getResumeId, resumeId).orderByAsc(UserResumeProject::getSortOrder));
|
||||
List<UserResumeCompetition> resumeCompetitionList = resumeCompetitionMapper.selectList(new LambdaQueryWrapper<UserResumeCompetition>().eq(UserResumeCompetition::getResumeId, resumeId).orderByAsc(UserResumeCompetition::getSortOrder));
|
||||
|
||||
Instant now = Instant.now();
|
||||
|
||||
@@ -368,8 +364,8 @@ public class UserProfileService {
|
||||
dest.setUserId(userId);
|
||||
dest.setSchool(src.getSchool());
|
||||
dest.setMajor(src.getMajor());
|
||||
dest.setDegree(DEGREE_MAP.get(src.getDegree()));
|
||||
dest.setStudyType(STUDY_TYPE_MAP.get(src.getStudyType()));
|
||||
dest.setDegree(Objects.isNull(src.getDegree())?null:DEGREE_MAP.get(src.getDegree()));
|
||||
dest.setStudyType(Objects.isNull(src.getStudyType())?null:STUDY_TYPE_MAP.get(src.getStudyType()));
|
||||
dest.setStartDate(src.getStartDate());
|
||||
dest.setEndDate(src.getEndDate());
|
||||
dest.setDescription(src.getDescription());
|
||||
|
||||
Reference in New Issue
Block a user