Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
This commit is contained in:
commit
e2f271eba4
|
@ -193,19 +193,7 @@ export class OrganizationComponent
|
|||
)
|
||||
)
|
||||
.subscribe(list => {
|
||||
this.myDepartmentUserInfoList = list;
|
||||
if (!this.selectedDepartmentUserInfoList) {
|
||||
this.selectedDepartmentUserInfoList = list;
|
||||
}
|
||||
|
||||
if (!!this.vsDeptUser) {
|
||||
this.vsDeptUser.scrollToIndex(0, true, 0, 0);
|
||||
}
|
||||
if (!!this.psDirectiveRef) {
|
||||
this.psDirectiveRef.update();
|
||||
}
|
||||
});
|
||||
|
||||
if (!list) {
|
||||
this.store
|
||||
.pipe(
|
||||
take(1),
|
||||
|
@ -234,6 +222,21 @@ export class OrganizationComponent
|
|||
})
|
||||
)
|
||||
.subscribe();
|
||||
return;
|
||||
}
|
||||
|
||||
this.myDepartmentUserInfoList = list;
|
||||
if (!this.selectedDepartmentUserInfoList) {
|
||||
this.selectedDepartmentUserInfoList = list;
|
||||
}
|
||||
|
||||
if (!!this.vsDeptUser) {
|
||||
this.vsDeptUser.scrollToIndex(0, true, 0, 0);
|
||||
}
|
||||
if (!!this.psDirectiveRef) {
|
||||
this.psDirectiveRef.update();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
ngAfterViewChecked(): void {
|
||||
|
|
Loading…
Reference in New Issue
Block a user