From e8cc46a0316d45cba7d86883f9e15cdf7a875d73 Mon Sep 17 00:00:00 2001 From: khyaejin Date: Fri, 15 Nov 2024 21:15:35 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20[Fix]=20=EC=B9=9C=EA=B5=AC=20?= =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=A1=B0=ED=9A=8C=20&=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=20=EA=B2=80=EC=83=89=20=EC=9C=A0=ED=9A=A8=EC=84=B1?= =?UTF-8?q?=EA=B2=80=EC=82=AC=20=EC=B2=98=EB=A6=AC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tostar/domain/user/service/UserServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/likelion/tostar/domain/user/service/UserServiceImpl.java b/src/main/java/com/likelion/tostar/domain/user/service/UserServiceImpl.java index fd87859..98646d8 100755 --- a/src/main/java/com/likelion/tostar/domain/user/service/UserServiceImpl.java +++ b/src/main/java/com/likelion/tostar/domain/user/service/UserServiceImpl.java @@ -153,9 +153,9 @@ public ResponseEntity searchUser(Long userId, String petName, int page, int s .id(user.getId()) .petName(user.getPetName()) .profileImage(user.getProfileImage()) - .category(user.getCategory()) - .birthday(user.getBirthday().toString()) - .starDay(user.getStarDay().toString()) + .category(user.getCategory() != null ? user.getCategory() : "") // category가 없으면 빈 문자열 + .birthday(user.getBirthday() != null ? String.valueOf(user.getBirthday()) : "") // birthday가 없으면 빈 문자열 + .starDay(user.getStarDay() != null ? String.valueOf(user.getStarDay()) : "") // starDay가 없으면 빈 문자열 .build(); data.add(dto); } @@ -273,9 +273,9 @@ public ResponseEntity searchFriend(Long userId) { .id(friend.getId()) .petName(friend.getPetName()) .profileImage(friend.getProfileImage()) - .category(friend.getCategory()) - .birthday(String.valueOf(friend.getBirthday())) - .starDay(String.valueOf(friend.getStarDay())) + .category(friend.getCategory() != null ? friend.getCategory() : "") + .birthday(friend.getBirthday() != null ? String.valueOf(friend.getBirthday()) : "") + .starDay(friend.getStarDay() != null ? String.valueOf(friend.getStarDay()) : "") .build(); result.add(data); }