From fa4633b012dd97c75e9ed143ef63ec3727f705fe Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Fri, 7 Feb 2020 17:37:20 +0900
Subject: [PATCH] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20200,?=
 =?UTF-8?q?=20232?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/integrated-search.dialog.component.html   |  1 +
 .../search/integrated-search.dialog.component.ts     | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
index 85f30614..7b9ae48a 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
@@ -13,6 +13,7 @@
   </mat-card-header>
   <mat-card-content>
     <ucap-integrated-search
+      #integratedSearch
       [sessionVerinfo]="sessionVerinfo"
       [presence]="presence$ | async"
       [searchWord]="!!data.keyword ? data.keyword : ''"
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts
index d3473bfe..01307145 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
+import { Component, OnInit, Inject, OnDestroy, ViewChild } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA, PageEvent } from '@angular/material';
 import { KEY_VER_INFO } from '@app/types';
 import { SessionStorageService } from '@ucap-webmessenger/web-storage';
@@ -31,6 +31,7 @@ import {
   ProfileDialogData,
   ProfileDialogResult
 } from '../profile/profile.dialog.component';
+import { IntegratedSearchComponent } from 'projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component';
 
 export interface IntegratedSearchDialogData {
   keyword: string;
@@ -59,6 +60,9 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
   pageCurrent = 1;
   pageListCount = 20;
 
+  @ViewChild('integratedSearch', { static: false })
+  integratedSearchComponent: IntegratedSearchComponent;
+
   constructor(
     public dialogRef: MatDialogRef<
       IntegratedSearchDialogData,
@@ -109,12 +113,14 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
 
   onReSearch(searchWord: string) {
     this.pageCurrent = 1;
-
+    this.integratedSearchComponent.paginator.pageIndex = 0;
     this.onSearch(searchWord);
   }
 
   onSearch(searchWord: string) {
-    this.currentSearchWord = this.data.keyword;
+    if (this.currentSearchWord !== searchWord) {
+      this.currentSearchWord = searchWord;
+    }
 
     if (searchWord.trim().length > 0) {
       this.searchingProcessing = true;