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

migration and #2317(2)
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m27s
Details

Browse source
This commit is contained in:
Adisak 2026-02-19 10:36:32 +07:00
parent cc6e61f4de
commit 525a885e13
4 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1537,7 +1537,7 @@ export class ProfileEmployeeTempController extends Controller {
let query = await this.profileRepo
.createQueryBuilder("profileEmployee")
.leftJoinAndSelect("profileEmployee.posLevelTemp", "posLevelTemp")
.leftJoinAndSelect("profileEmployee.posType", "posType")
.leftJoinAndSelect("profileEmployee.posTypeTemp", "posTypeTemp")
.leftJoinAndSelect("profileEmployee.current_holderTemps", "current_holderTemps")
.leftJoinAndSelect("profileEmployee.profileEmployeeEmployment", "profileEmployeeEmployment")
.leftJoinAndSelect("current_holderTemps.positions", "positions")
@ -1606,7 +1606,7 @@ export class ProfileEmployeeTempController extends Controller {
)
.andWhere(
posType != undefined && posType != null && posType != ""
? "posType.posTypeName LIKE :keyword1"
? "posTypeTemp.posTypeName LIKE :keyword1"
: "1=1",
{
keyword1: `${posType}`,
@ -1709,10 +1709,11 @@ export class ProfileEmployeeTempController extends Controller {
citizenId: _data.citizenId,
// posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName,
posLevel: _data.posLevelTemp == null ? null : _data.posLevelTemp.posLevelName,
posType: _data.posType == null ? null : _data.posType.posTypeName,
posTypeShortName: _data.posType == null ? null : _data.posType.posTypeShortName,
posLevelId: _data.posLevel == null ? null : _data.posLevel.id,
posTypeId: _data.posType == null ? null : _data.posType.id,
// posType: _data.posType == null ? null : _data.posType.posTypeName,
posType: _data.posTypeTemp == null ? null : _data.posTypeTemp.posTypeName,
posTypeShortName: _data.posTypeTemp == null ? null : _data.posTypeTemp.posTypeShortName,
posLevelId: _data.posLevelTemp == null ? null : _data.posLevelTemp.id,
posTypeId: _data.posTypeTemp == null ? null : _data.posTypeTemp.id,
positionId: _data.positionIdTemp,
posmasterId: _data.posmasterIdTemp,
position: _data.position,