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

fixed bug api service leave type name
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m10s
Details

Browse source
This commit is contained in:
Warunee Tamkoo 2026-05-26 17:37:08 +07:00
parent 0aa788fe0b
commit c87b604685
1 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/controllers/ApiWebServiceController.ts
View file

@ -525,20 +525,19 @@ export class ApiWebServiceController extends Controller {
// สำหรับ ProfileLeave: ตรวจสอบฟิลด์ที่ต้องการ join และแปลง propertyKey
const profileLeaveFieldJoins: Record<string, string> = {}; // alias -> relationName
if (tbMain === "ProfileLeave") {
propertyKey = propertyKey.map((key) => {
const [table, field] = key.split(".");
if (table === "ProfileLeave") {
const replacement = this.PROFILELEAVE_FIELD_REPLACEMENTS[field];
if (replacement) {
const alias = `${table}_${replacement.joinRelation}`;
profileLeaveFieldJoins[alias] = replacement.joinRelation;
return `${alias}.${replacement.joinField}`;
}
// Process ProfileLeave fields regardless of main table
propertyKey = propertyKey.map((key) => {
const [table, field] = key.split(".");
if (table === "ProfileLeave") {
const replacement = this.PROFILELEAVE_FIELD_REPLACEMENTS[field];
if (replacement) {
const alias = `${table}_${replacement.joinRelation}`;
profileLeaveFieldJoins[alias] = replacement.joinRelation;
return `${alias}.${replacement.joinField}`;
}
return key;
});
}
}
return key;
});
const queryBuilder = repo.createQueryBuilder(tbMain);
@ -615,10 +614,19 @@ export class ApiWebServiceController extends Controller {
}
// join สำหรับฟิลด์ ProfileLeave ที่ต้องการดึงค่าจากตารางอื่น
if (tbMain === "ProfileLeave" && Object.keys(profileLeaveFieldJoins).length > 0) {
Object.entries(profileLeaveFieldJoins).forEach(([alias, relationName]) => {
queryBuilder.leftJoin(`${tbMain}.${relationName}`, alias);
});
if (Object.keys(profileLeaveFieldJoins).length > 0) {
if (tbMain === "ProfileLeave") {
// ProfileLeave is the main table - direct join
Object.entries(profileLeaveFieldJoins).forEach(([alias, relationName]) => {
queryBuilder.leftJoin(`${tbMain}.${relationName}`, alias);
});
} else {
// ProfileLeave is a related table - the base join is already created by propertyOtherKey logic
// Join from the ProfileLeave alias (not from nested path)
Object.entries(profileLeaveFieldJoins).forEach(([alias, relationName]) => {
queryBuilder.leftJoin(`ProfileLeave.${relationName}`, alias);
});
}
}
// join สำหรับ PosMaster เมื่อต้องการดึงค่าจาก Profile (ข้อมูลคนครอง)