diff --git a/server/Recruit-Api/src/main/java/com/econovation/recruit/api/card/service/CardService.java b/server/Recruit-Api/src/main/java/com/econovation/recruit/api/card/service/CardService.java index 82b65157..33cda684 100644 --- a/server/Recruit-Api/src/main/java/com/econovation/recruit/api/card/service/CardService.java +++ b/server/Recruit-Api/src/main/java/com/econovation/recruit/api/card/service/CardService.java @@ -77,12 +77,16 @@ public List getByNavigationId(Integer navigationId, Intege boards = boards.stream() .filter( - board -> - Optional.ofNullable(board.getCardId()) - .map(id -> answerIdByCardIdMap.getOrDefault(id, null)) - .map(id -> yearByAnswerIdMap.getOrDefault(id, null)) - .map(y -> y.equals(year)) - .orElse(false)) + board ->{ + if(board.getId()==1 || board.getId()==2 || board.getId()==3) { + return true; + } + return Optional.ofNullable(board.getCardId()) + .map(answerIdByCardIdMap::get) + .map(yearByAnswerIdMap::get) + .map(y -> y.equals(year)) + .orElse(false); + }) .toList(); cards =