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

fix ยศไม่แสดงในระบบทะเบียน #2469 + Error Log api check-keycloak
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m8s
Details

Browse source
This commit is contained in:
harid 2026-05-18 15:02:38 +07:00
parent 173378d87c
commit 15830ef2ba
2 changed files with 81 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/controllers/CommandController.ts
View file

@ -6594,9 +6594,9 @@ export class CommandController extends Controller {
profile.amountSpecial = item.bodyProfile.amountSpecial ?? null;
profile.isProbation = item.bodyProfile.isProbation;
//เพิ่มใหม่จากรับโอน
profile.rank = item.bodyProfile.rank ?? null;
profile.prefix = item.bodyProfile.prefix ?? null;
profile.prefixMain = item.bodyProfile.prefix ?? null;
profile.rank = item?.bodyProfile?.rank ?? null;
profile.prefix = item?.bodyProfile?.rank ?? item?.bodyProfile?.prefix ?? null;
profile.prefixMain = item?.bodyProfile?.prefix ?? null;
profile.firstName = item.bodyProfile.firstName ?? null;
profile.lastName = item.bodyProfile.lastName ?? null;
profile.birthDate = item.bodyProfile.birthDate ?? null;
@ -6658,9 +6658,9 @@ export class CommandController extends Controller {
profile.amount = item.bodyProfile.amount ?? null;
profile.amountSpecial = item.bodyProfile.amountSpecial ?? null;
profile.isProbation = item.bodyProfile.isProbation;
profile.rank = item.bodyProfile.rank ?? null;
profile.prefix = item.bodyProfile.prefix ?? null;
profile.prefixMain = item.bodyProfile.prefix ?? null;
profile.rank = item?.bodyProfile?.rank ?? null;
profile.prefix = item?.bodyProfile?.rank ?? item?.bodyProfile?.prefix ?? null;
profile.prefixMain = item?.bodyProfile?.prefix ?? null;
profile.firstName = item.bodyProfile.firstName ?? null;
profile.lastName = item.bodyProfile.lastName ?? null;
profile.birthDate = item.bodyProfile.birthDate ?? null;
@ -6717,12 +6717,9 @@ export class CommandController extends Controller {
profile.lastUpdateFullName = req.user.name;
profile.lastUpdatedAt = new Date();
//เพิ่มใหม่จากรับโอน
profile.rank = item.bodyProfile.rank ?? null;
profile.prefix =
item.bodyProfile.prefix && item.bodyProfile.prefix != ""
? item.bodyProfile.prefix
: profile.prefix;
profile.prefixMain = item.bodyProfile.prefix ?? null;
profile.rank = item?.bodyProfile?.rank ?? null;
profile.prefix = item?.bodyProfile?.rank ?? item?.bodyProfile?.prefix ?? null;
profile.prefixMain = item?.bodyProfile?.prefix ?? null;
profile.firstName =
item.bodyProfile.firstName && item.bodyProfile.firstName != ""
? item.bodyProfile.firstName