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

no message

Browse source
This commit is contained in:
kittapath 2024-10-17 22:24:25 +07:00
parent b2e1a5be3d
commit f51adcc8cb
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/PositionController.ts
View file

@ -4069,7 +4069,7 @@ export class PositionController extends Controller {
},
) {
let conditionGroup = "";
if (body.type.trim().toUpperCase() == "GROUP1") {
if (body.type.trim().toUpperCase() == "GROUP1.1") {
conditionGroup =
"(posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ชำนาญงาน') OR (posType.posTypeName = 'ทั่วไป' AND posLevel.posLevelName = 'ปฏิบัติงาน') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ปฏิบัติการ') OR (posType.posTypeName = 'วิชาการ' AND posLevel.posLevelName = 'ชำนาญการ')";
} else if (body.type.trim().toUpperCase() == "GROUP1.2") {
@ -4094,7 +4094,9 @@ export class PositionController extends Controller {
.leftJoinAndSelect("positions.posType", "posType")
.leftJoinAndSelect("positions.posLevel", "posLevel")
.leftJoinAndSelect("posMaster.orgRevision", "orgRevision")
.andWhere("posMaster.orgRootId = :orgRootId", { orgRootId: body.rootId })
.andWhere("posMaster.orgRootId LIKE :orgRootId", {
orgRootId: body.type.trim().toUpperCase() == "GROUP1" ? body.rootId : `%%`,
})
.andWhere("posMaster.statusReport = :statusReport", { statusReport: "PENDING" })
.andWhere("posMaster.next_holderId IS NOT NULL")
.andWhere("orgRevision.orgRevisionIsCurrent = :orgRevisionIsCurrent", {