hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-03-07 09:33:52 +07:00
commit ae0d0388b8
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ProfileController.ts
View file

@ -906,6 +906,7 @@ export class ProfileController extends Controller {
page: number; page: number;
pageSize: number; pageSize: number;
keyword?: string; keyword?: string;
rootId?: string;
}, },
) { ) {
const findRevision = await this.orgRevisionRepository.findOne({ const findRevision = await this.orgRevisionRepository.findOne({
@ -930,6 +931,7 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("current_holder.posType", "posType") .leftJoinAndSelect("current_holder.posType", "posType")
.where({ .where({
orgRevisionId: findRevision?.id, orgRevisionId: findRevision?.id,
orgRootId: body.rootId == null ? "1=1" : body.rootId,
current_holderId: Not(IsNull()), current_holderId: Not(IsNull()),
}) })
.andWhere( .andWhere(