From 2bd3e42cc77e77319e738f3f1591ff0fceb04ae7 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Thu, 13 Feb 2020 11:01:10 +0900
Subject: [PATCH] bugfix

---
 .../messenger/components/left-sidenav/chat.component.ts   | 2 ++
 .../components/left-sidenav/organization.component.ts     | 8 ++++++--
 .../src/lib/components/messages.component.ts              | 8 ++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
index 37d1af8c..6621c8ba 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.ts
@@ -295,5 +295,7 @@ export class ChatComponent implements OnInit, OnDestroy, AfterViewChecked {
         );
       }
     }
+
+    return [];
   }
 }
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
index 0027d837..38a6fe32 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
@@ -524,6 +524,10 @@ export class OrganizationComponent
 
   /** 전체선택 이벤트 */
   onCheckAllUser(value: boolean) {
+    if (!this.loginRes) {
+      return false;
+    }
+
     this.checkAllUser.emit({
       isChecked: value,
       userInfos: (this.isShowSearch
@@ -543,7 +547,7 @@ export class OrganizationComponent
     this.checkUser.emit(params);
   }
   onToggleUser(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) {
-    if (userInfo.seq === this.loginRes.userSeq) {
+    if (!this.loginRes || userInfo.seq === this.loginRes.userSeq) {
       return;
     }
     this.toggleUser.emit(userInfo);
@@ -647,7 +651,7 @@ export class OrganizationComponent
     event.preventDefault();
     event.stopPropagation();
 
-    if (userInfo.seq === this.loginRes.userSeq) {
+    if (!this.loginRes || userInfo.seq === this.loginRes.userSeq) {
       return;
     }
 
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
index 9f481c02..9c4caf79 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts
@@ -180,7 +180,9 @@ export class MessagesComponent implements OnInit, OnDestroy {
     this.roomInfoSubscription = this.roomInfo$.subscribe(roomInfo => {
       if (
         !this.roomInfo ||
-        (!!this.roomInfo && this.roomInfo.roomSeq !== roomInfo.roomSeq)
+        (!!this.roomInfo &&
+          !!roomInfo &&
+          this.roomInfo.roomSeq !== roomInfo.roomSeq)
       ) {
         this.baseEventSeq = 0;
       }
@@ -201,7 +203,9 @@ export class MessagesComponent implements OnInit, OnDestroy {
 
       if (
         !this.roomInfo ||
-        (!!this.roomInfo && this.roomInfo.roomSeq !== roomInfo.roomSeq)
+        (!!this.roomInfo &&
+          !!roomInfo &&
+          this.roomInfo.roomSeq !== roomInfo.roomSeq)
       ) {
         this.initEventMore();
       }