ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

Browse Source
This commit is contained in:
leejinho 2020-02-05 11:13:12 +09:00
commit e2f271eba4
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts
View File

@ -193,6 +193,38 @@ export class OrganizationComponent
)
)
.subscribe(list => {
if (!list) {
this.store
.pipe(
take(1),
select(AppStore.AccountSelector.AuthenticationSelector.loginRes),
map(loginRes => {
this.store.dispatch(
QueryStore.myDeptUser({
divCd: 'ORG',
companyCode: this.loginInfo.companyCode,
seq: loginRes.departmentCode,
search: '',
searchRange: DeptSearchType.All,
senderCompanyCode: this.loginInfo.companyCode,
senderEmployeeType: loginRes.userInfo.employeeType
})
);
return loginRes;
}),
map(loginRes => {
this.loginRes = loginRes;
this.selectedDepartmentName = {
name: loginRes.userInfo.deptName,
nameEn: loginRes.userInfo.deptNameEn,
nameCn: loginRes.userInfo.deptNameCn
};
})
)
.subscribe();
return;
}
this.myDepartmentUserInfoList = list;
if (!this.selectedDepartmentUserInfoList) {
this.selectedDepartmentUserInfoList = list;
@ -205,35 +237,6 @@ export class OrganizationComponent
this.psDirectiveRef.update();
}
});
this.store
.pipe(
take(1),
select(AppStore.AccountSelector.AuthenticationSelector.loginRes),
map(loginRes => {
this.store.dispatch(
QueryStore.myDeptUser({
divCd: 'ORG',
companyCode: this.loginInfo.companyCode,
seq: loginRes.departmentCode,
search: '',
searchRange: DeptSearchType.All,
senderCompanyCode: this.loginInfo.companyCode,
senderEmployeeType: loginRes.userInfo.employeeType
})
);
return loginRes;
}),
map(loginRes => {
this.loginRes = loginRes;
this.selectedDepartmentName = {
name: loginRes.userInfo.deptName,
nameEn: loginRes.userInfo.deptNameEn,
nameCn: loginRes.userInfo.deptNameCn
};
})
)
.subscribe();
}
ngAfterViewChecked(): void {