Skip to content

Commit

Permalink
Merge pull request #277 from bankidz/dev
Browse files Browse the repository at this point in the history
[v1.1.6] 추가 수정버전 배포
  • Loading branch information
sanbonai06 authored Nov 21, 2022
2 parents 3ba68dc + ffd2ba9 commit 9ecb68d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 0 additions & 2 deletions config/nginx/default.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

server {

listen 80;
Expand All @@ -9,5 +8,4 @@
proxy_set_header Host $host;
proxy_redirect off;
}

}
2 changes: 1 addition & 1 deletion src/main/java/com/ceos/bankids/mapper/FamilyMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public FamilyDTO deleteFamilyUser(User user, FamilyRequest familyRequest) {
if (familyUserList.size() == 0) {
familyService.deleteFamily(family);
}

notificationService.deleteAllNotification(user);
return null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ public void newFamilyUserNotification(User newFamilyUser, List<FamilyUser> famil
familyUserList.forEach(familyUser -> {
User user = familyUser.getUser();
Boolean checkServiceOptIn = checkServiceOptIn(user, title, notificationBody,
notificationCategory, "/newFamily");
notificationCategory, "/mypage/new");
if (checkServiceOptIn) {
this.sendMessage(user, title, notificationBody, newMap,
notificationCategory, "/mypage/new");
Expand Down

0 comments on commit 9ecb68d

Please sign in to comment.