From 64c2ac0524cb166abb206def1d83af3ea2432888 Mon Sep 17 00:00:00 2001 From: zk Date: Tue, 19 May 2026 15:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E4=BA=86=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=AF=E8=83=BD=E4=B8=BAnull,=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84map=20key=20=E4=B8=8D=E8=83=BD=E4=B8=BAnull=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jiayunet/service/UserProfileService.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/client-api/src/main/java/org/jiayunet/service/UserProfileService.java b/client-api/src/main/java/org/jiayunet/service/UserProfileService.java index 8b0560a..768df84 100644 --- a/client-api/src/main/java/org/jiayunet/service/UserProfileService.java +++ b/client-api/src/main/java/org/jiayunet/service/UserProfileService.java @@ -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 resumeEducationList = resumeEducationMapper.selectList( - new LambdaQueryWrapper().eq(UserResumeEducation::getResumeId, resumeId).orderByAsc(UserResumeEducation::getSortOrder)); - List resumeWorkList = resumeWorkMapper.selectList( - new LambdaQueryWrapper().eq(UserResumeWork::getResumeId, resumeId).orderByAsc(UserResumeWork::getSortOrder)); - List resumeInternshipList = resumeInternshipMapper.selectList( - new LambdaQueryWrapper().eq(UserResumeInternship::getResumeId, resumeId).orderByAsc(UserResumeInternship::getSortOrder)); - List resumeProjectList = resumeProjectMapper.selectList( - new LambdaQueryWrapper().eq(UserResumeProject::getResumeId, resumeId).orderByAsc(UserResumeProject::getSortOrder)); - List resumeCompetitionList = resumeCompetitionMapper.selectList( - new LambdaQueryWrapper().eq(UserResumeCompetition::getResumeId, resumeId).orderByAsc(UserResumeCompetition::getSortOrder)); + List resumeEducationList = resumeEducationMapper.selectList(new LambdaQueryWrapper().eq(UserResumeEducation::getResumeId, resumeId).orderByAsc(UserResumeEducation::getSortOrder)); + List resumeWorkList = resumeWorkMapper.selectList(new LambdaQueryWrapper().eq(UserResumeWork::getResumeId, resumeId).orderByAsc(UserResumeWork::getSortOrder)); + List resumeInternshipList = resumeInternshipMapper.selectList(new LambdaQueryWrapper().eq(UserResumeInternship::getResumeId, resumeId).orderByAsc(UserResumeInternship::getSortOrder)); + List resumeProjectList = resumeProjectMapper.selectList(new LambdaQueryWrapper().eq(UserResumeProject::getResumeId, resumeId).orderByAsc(UserResumeProject::getSortOrder)); + List resumeCompetitionList = resumeCompetitionMapper.selectList(new LambdaQueryWrapper().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());