From 1de4d72472c851699434f41d95476a45539d2660 Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 20 Dec 2019 11:33:14 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89=EC=8B=9C=20=EB=B3=B8?= =?UTF-8?q?=EC=9D=B8=20=EA=B2=80=EC=83=89=EB=90=98=EC=A7=80=EB=A7=8C=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=EC=9D=B4=20=ED=95=84=EC=9A=94=ED=95=A0=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EC=97=90=EB=8A=94=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-sidenav/group.component.ts | 11 ++++++----- .../left-sidenav/organization.component.ts | 11 ++++++----- .../chat/create-chat.dialog.component.html | 2 +- .../dialogs/chat/create-chat.dialog.component.ts | 15 ++++++++++----- .../src/lib/components/messages.component.html | 2 +- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts index 53c7751a..935e1ef3 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts @@ -275,11 +275,12 @@ export class GroupComponent implements OnInit, OnDestroy { switch (res.SSVC_TYPE) { case SSVC_TYPE_QUERY_DEPT_USER_DATA: const userInfos = (res as DeptUserData).userInfos; - searchUserInfos.push( - ...userInfos.filter( - userInfo => userInfo.seq !== this.loginRes.userSeq - ) - ); + // searchUserInfos.push( + // ...userInfos.filter( + // userInfo => userInfo.seq !== this.loginRes.userSeq + // ) + // ); + searchUserInfos.push(...userInfos); break; case SSVC_TYPE_QUERY_DEPT_USER_RES: { 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 8dbe42d4..53ac2f1f 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 @@ -267,11 +267,12 @@ export class OrganizationComponent switch (res.SSVC_TYPE) { case SSVC_TYPE_QUERY_DEPT_USER_DATA: const userInfos = (res as DeptUserData).userInfos; - searchUserInfos.push( - ...userInfos.filter( - userInfo => userInfo.seq !== this.loginRes.userSeq - ) - ); + // searchUserInfos.push( + // ...userInfos.filter( + // userInfo => userInfo.seq !== this.loginRes.userSeq + // ) + // ); + searchUserInfos.push(...userInfos); break; case SSVC_TYPE_QUERY_DEPT_USER_RES: { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html index 676860a9..6bdd98c4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html @@ -118,7 +118,7 @@ [sessionVerinfo]="sessionVerinfo" [selectedUserList]="selectedUserList" [isChecked]="getCheckedUser(userInfo)" - [checkable]="true" + [checkable]="userInfo.seq !== loginRes.userSeq" [checkDisabled]="!getCheckableUser(userInfo)" (checkUser)="onCheckUser($event)" (click)="onToggleUser(userInfo)" diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts index 27283b69..bda43023 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.ts @@ -324,11 +324,12 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { switch (res.SSVC_TYPE) { case SSVC_TYPE_QUERY_DEPT_USER_DATA: const userInfos = (res as DeptUserData).userInfos; - searchUserInfos.push( - ...userInfos.filter( - userInfo => userInfo.seq !== this.loginRes.userSeq - ) - ); + // searchUserInfos.push( + // ...userInfos.filter( + // userInfo => userInfo.seq !== this.loginRes.userSeq + // ) + // ); + searchUserInfos.push(...userInfos); break; case SSVC_TYPE_QUERY_DEPT_USER_RES: { @@ -507,6 +508,10 @@ export class CreateChatDialogComponent implements OnInit, OnDestroy { this.changeDetectorRef.detectChanges(); } onToggleUser(userInfo: UserInfo | UserInfoSS | UserInfoF | UserInfoDN) { + if (userInfo.seq === this.loginRes.userSeq) { + return; + } + if (this.data.type === UserSelectDialogType.EditChatMember) { if ( this.data.curRoomUser.filter(user => user.seq === userInfo.seq).length > diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html index db59b40a..0b912069 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html @@ -1,5 +1,5 @@
-
+