diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html index 0d4974f8..4683d146 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.html @@ -1,13 +1,19 @@
- +
-
- {{ userInfo.name }} +
+ (선택된부서명) +
+
+ + +
+
+ (하단버튼영역)
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 6d4da9ec..5a7be66b 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 @@ -28,6 +28,8 @@ export class OrganizationComponent implements OnInit { selectedDepartmentUserInfoList$: Observable; selectedDepartmentStatus$: Observable; + loginInfo = this.sessionStorageService.get(KEY_LOGIN_INFO); + constructor( private store: Store, private queryProtocolService: QueryProtocolService, @@ -47,10 +49,6 @@ export class OrganizationComponent implements OnInit { this.selectedDepartmentStatus$ = this.store.pipe( select(AppStore.MessengerSelector.QuerySelector.selectedDepartmentStatus) ); - } - - onSelectedOrganization(deptInfo: DeptInfo) { - const loginInfo = this.sessionStorageService.get(KEY_LOGIN_INFO); this.store .pipe( @@ -60,11 +58,33 @@ export class OrganizationComponent implements OnInit { this.store.dispatch( QueryStore.deptUser({ divCd: 'ORG', - companyCode: loginInfo.companyCode, + companyCode: this.loginInfo.companyCode, + seq: loginRes.departmentCode, + search: '', + searchRange: DeptSearchType.All, + senderCompanyCode: this.loginInfo.companyCode, + senderEmployeeType: loginRes.userInfo.employeeType + }) + ); + }) + ) + .subscribe(); + } + + onSelectedOrganization(deptInfo: DeptInfo) { + this.store + .pipe( + take(1), + select(AppStore.AccountSelector.AuthenticationSelector.loginRes), + map(loginRes => { + this.store.dispatch( + QueryStore.deptUser({ + divCd: 'ORG', + companyCode: this.loginInfo.companyCode, seq: deptInfo.seq, search: '', searchRange: DeptSearchType.All, - senderCompanyCode: loginInfo.companyCode, + senderCompanyCode: this.loginInfo.companyCode, senderEmployeeType: loginRes.userInfo.employeeType }) ); diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts index 433e2d78..3dc60ce6 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/messenger.layout.module.ts @@ -17,7 +17,7 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { UCapUiModule } from '@ucap-webmessenger/ui'; import { UCapUiChatModule } from '@ucap-webmessenger/ui-chat'; import { UCapUiRoomModule } from '@ucap-webmessenger/ui-room'; - +import { UCapUiProfileModule } from '@ucap-webmessenger/ui-profile'; import { UCapUiGroupModule } from '@ucap-webmessenger/ui-group'; import { UCapUiOrganizationModule } from '@ucap-webmessenger/ui-organization'; @@ -40,6 +40,7 @@ import { DIALOGS } from './dialogs'; UCapUiModule, UCapUiChatModule, UCapUiRoomModule, + UCapUiProfileModule, UCapUiGroupModule, UCapUiOrganizationModule ], diff --git a/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-info.ts b/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-info.ts index 4d3ea6a2..e8404dbc 100644 --- a/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-info.ts +++ b/projects/ucap-webmessenger-protocol-query/src/lib/models/dept-info.ts @@ -1,26 +1,26 @@ import { DeptType } from '../types/dept.type'; export interface DeptInfo { - // 부서SEQ + /** 부서SEQ */ seq: number; - // 부서명 + /** 부서명 */ name: string; - // 기관코드 + /** 기관코드 */ companyCode: string; - // 부서타입 + /** 부서타입 */ type: DeptType; - // 본부SEQ + /** 본부SEQ */ rootSeq: number; - // 상위부서SEQ + /** 상위부서SEQ */ parentSeq: number; - // 조회순서 + /** 조회순서 */ order: string; - // 조회레벨 + /** 조회레벨 */ depth: number; - // ActiveYN + /** ActiveYN */ isActive: boolean; - // 부서명(영어) + /** 부서명(영어) */ nameEn: string; - // 부서명(중국어) + /** 부서명(중국어) */ nameCn: string; }