From 30843f2de9f61d75000567fd636a8955f12b9bd9 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Tue, 31 Mar 2020 13:18:43 +0900
Subject: [PATCH] =?UTF-8?q?bugfix=20::=20=ED=95=84=ED=84=B0=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95,=20=ED=95=84=ED=84=B0=20drop=20?=
 =?UTF-8?q?=EC=98=81=EC=97=AD=20=ED=83=80=EC=9D=B4=ED=8B=80=20=EC=9C=84?=
 =?UTF-8?q?=EB=A1=9C=20=EC=95=88=EC=98=AC=EB=9D=BC=20=EA=B0=80=EA=B2=8C=20?=
 =?UTF-8?q?=EA=B3=A0=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main-contents/organization.component.html    |  4 ++++
 .../main-contents/organization.component.ts      | 16 ++++++++--------
 .../integrated-search.dialog.component.html      |  4 ++++
 .../search/integrated-search.dialog.component.ts | 16 ++++++++--------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html
index 00112814..4635478e 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html
@@ -30,6 +30,7 @@
           <mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
           <mat-select
             #filterCompany
+            disableOptionCentering="true"
             [formControl]="fcCompany"
             multiple
             (openedChange)="onOpenedChange($event)"
@@ -57,6 +58,7 @@
           <mat-label>{{ 'search.fieldGrade' | translate }}</mat-label>
           <mat-select
             #filterGrade
+            disableOptionCentering="true"
             [formControl]="fcGrade"
             multiple
             (openedChange)="onOpenedChange($event)"
@@ -84,6 +86,7 @@
           <mat-label>{{ 'search.fieldWorkPlace' | translate }}</mat-label>
           <mat-select
             #filterWorkPlace
+            disableOptionCentering="true"
             [formControl]="fcWorkPlace"
             multiple
             (openedChange)="onOpenedChange($event)"
@@ -111,6 +114,7 @@
           <mat-label>{{ 'presence.label' | translate }}</mat-label>
           <mat-select
             #filterPresence
+            disableOptionCentering="true"
             [formControl]="fcPresence"
             multiple
             (openedChange)="onOpenedChange($event)"
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts
index f35f7d30..935dc97d 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.ts
@@ -641,10 +641,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
 
     let isMulti = false;
     if (!!companies && companies.length > 0) {
-      isMulti = true;
-      const data = !!isMulti
+      const data = !isMulti
         ? this.originDepartmentUserInfoList
         : this.departmentUserInfoList;
+      isMulti = true;
 
       this.departmentUserInfoList = data.filter(userInfo => {
         if (
@@ -658,10 +658,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
       });
     }
     if (!!grades && grades.length > 0) {
-      isMulti = true;
-      const data = !!isMulti
+      const data = !isMulti
         ? this.originDepartmentUserInfoList
         : this.departmentUserInfoList;
+      isMulti = true;
 
       this.departmentUserInfoList = data.filter(userInfo => {
         if (
@@ -685,10 +685,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
       });
     }
     if (!!workplaces && workplaces.length > 0) {
-      isMulti = true;
-      const data = !!isMulti
+      const data = !isMulti
         ? this.originDepartmentUserInfoList
         : this.departmentUserInfoList;
+      isMulti = true;
 
       this.departmentUserInfoList = data.filter(userInfo => {
         if (
@@ -702,10 +702,10 @@ export class OrganizationComponent implements OnInit, OnDestroy {
       });
     }
     if (!!presences && presences.length > 0) {
-      isMulti = true;
-      const data = !!isMulti
+      const data = !isMulti
         ? this.originDepartmentUserInfoList
         : this.departmentUserInfoList;
+      isMulti = true;
 
       this.departmentUserInfoList = data.filter(userInfo => {
         const userPresences = this.presenceSubject.value.filter(
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 6111ac70..64f375ac 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
@@ -50,6 +50,7 @@
             <mat-label>{{ 'search.fieldCompany' | translate }}</mat-label>
             <mat-select
               #filterCompany
+              disableOptionCentering="true"
               [formControl]="fcCompany"
               multiple
               (openedChange)="onOpenedChange($event)"
@@ -78,6 +79,7 @@
             <mat-label>{{ 'search.fieldGrade' | translate }}</mat-label>
             <mat-select
               #filterGrade
+              disableOptionCentering="true"
               [formControl]="fcGrade"
               multiple
               (openedChange)="onOpenedChange($event)"
@@ -106,6 +108,7 @@
             <mat-label>{{ 'search.fieldWorkPlace' | translate }}</mat-label>
             <mat-select
               #filterWorkPlace
+              disableOptionCentering="true"
               [formControl]="fcWorkPlace"
               multiple
               (openedChange)="onOpenedChange($event)"
@@ -134,6 +137,7 @@
             <mat-label>{{ 'presence.label' | translate }}</mat-label>
             <mat-select
               #filterPresence
+              disableOptionCentering="true"
               [formControl]="fcPresence"
               multiple
               (openedChange)="onOpenedChange($event)"
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 8d3bba3c..ca928d51 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
@@ -643,10 +643,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
 
     let isMulti = false;
     if (!!companies && companies.length > 0) {
-      isMulti = true;
-      const data = !!isMulti
+      const data = !isMulti
         ? this.originDepartmentUserInfoList
         : this.departmentUserInfoList;
+      isMulti = true;
 
       this.departmentUserInfoList = data.filter(userInfo => {
         if (
@@ -660,10 +660,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
       });
     }
     if (!!grades && grades.length > 0) {
-      isMulti = true;
-      const data = !!isMulti
+      const data = !isMulti
         ? this.originDepartmentUserInfoList
         : this.departmentUserInfoList;
+      isMulti = true;
 
       this.departmentUserInfoList = data.filter(userInfo => {
         if (
@@ -687,10 +687,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
       });
     }
     if (!!workplaces && workplaces.length > 0) {
-      isMulti = true;
-      const data = !!isMulti
+      const data = !isMulti
         ? this.originDepartmentUserInfoList
         : this.departmentUserInfoList;
+      isMulti = true;
 
       this.departmentUserInfoList = data.filter(userInfo => {
         if (
@@ -704,10 +704,10 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy {
       });
     }
     if (!!presences && presences.length > 0) {
-      isMulti = true;
-      const data = !!isMulti
+      const data = !isMulti
         ? this.originDepartmentUserInfoList
         : this.departmentUserInfoList;
+      isMulti = true;
 
       this.departmentUserInfoList = data.filter(userInfo => {
         const userPresences = this.presenceSubject.value.filter(