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

#857 (3)

Browse source
This commit is contained in:
AdisakKanthawilang 2024-12-16 17:39:27 +07:00
parent 168a5ec53c
commit 0338ba48d1
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/OrganizationUnauthorizeController.ts
View file

@ -666,7 +666,8 @@ export class OrganizationUnauthorizeController extends Controller {
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions") .leftJoinAndSelect("current_holders.positions", "positions")
.leftJoinAndSelect("positions.posExecutive", "posExecutive") .leftJoinAndSelect("positions.posExecutive", "posExecutive")
.where({ citizenId: id }) .where("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: findRevision.id })
.andWhere({ citizenId: id })
.getOne(); .getOne();
if (!findProfile) { if (!findProfile) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found Profile"); throw new HttpError(HttpStatusCode.NOT_FOUND, "not found Profile");
@ -872,8 +873,9 @@ export class OrganizationUnauthorizeController extends Controller {
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3") .leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4") .leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions") .leftJoinAndSelect("current_holders.positions", "positions")
.where("current_holders.orgRevisionId = :orgRevisionId", { orgRevisionId: findRevision.id })
// .leftJoinAndSelect("positions.posExecutive", "posExecutive") // .leftJoinAndSelect("positions.posExecutive", "posExecutive")
.where({ citizenId: id, employeeClass: "PERM" }) .andWhere({ citizenId: id, employeeClass: "PERM" })
.getOne(); .getOne();
if (!findProfile) { if (!findProfile) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found Profile"); throw new HttpError(HttpStatusCode.NOT_FOUND, "not found Profile");