From 589eb0206d0fdf230d721dc51d0151bfe8a9351f Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Mon, 30 Mar 2020 18:44:53 +0900
Subject: [PATCH] =?UTF-8?q?bugfix=20::=20EVENT=5FSEND=5FNOTI=20=EC=88=98?=
 =?UTF-8?q?=EC=8B=A0=EC=8B=9C=20=EC=A1=B0=EC=A7=81=EB=8F=84=20=ED=83=AD=20?=
 =?UTF-8?q?=EC=97=B4=EB=A0=A4=20=EC=9E=88=EC=9C=BC=EB=A9=B4=20=EB=85=B8?=
 =?UTF-8?q?=ED=8B=B0,=20=EC=95=8C=EB=A6=BC=20=EC=B6=94=EB=8F=84=EB=A1=9D?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/services/notification.service.ts  | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts
index 5e14844c..0728adae 100644
--- a/projects/ucap-webmessenger-app/src/app/services/notification.service.ts
+++ b/projects/ucap-webmessenger-app/src/app/services/notification.service.ts
@@ -127,7 +127,8 @@ import {
   LogoutInfo,
   KEY_LOGOUT_INFO,
   KEY_VER_INFO,
-  KEY_LOGIN_RES_INFO
+  KEY_LOGIN_RES_INFO,
+  MainMenu
 } from '@app/types';
 import { TranslateService } from '@ngx-translate/core';
 import { deleteMessageSuccess } from '@app/store/messenger/message';
@@ -248,10 +249,22 @@ export class AppNotificationService {
               (state: any) =>
                 state.messenger.sync.buddy2.entities as Dictionary<UserInfo>
             )
+          ),
+          this.store.pipe(
+            select(
+              (state: any) => state.messenger.settings.gnbMenuIndex as MainMenu
+            )
           )
         ),
         tap(
-          ([notiOrRes, curRoomInfo, curRoomUserInfo, roomList, buddyList]) => {
+          ([
+            notiOrRes,
+            curRoomInfo,
+            curRoomUserInfo,
+            roomList,
+            buddyList,
+            gnbMenuIndex
+          ]) => {
             switch (notiOrRes.SSVC_TYPE) {
               case SSVC_TYPE_EVENT_SEND_RES:
               case SSVC_TYPE_EVENT_SEND_NOTI:
@@ -296,6 +309,11 @@ export class AppNotificationService {
                       doNoti = true;
                     }
 
+                    // 조직도 탭이 열려 있다면
+                    if (gnbMenuIndex === MainMenu.Organization) {
+                      doNoti = true;
+                    }
+
                     // 방별 알림이 꺼져 있으면 노티 안함. > 우선순위 최상위.
                     if (
                       !!roomList[noti.roomSeq] &&