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

Merge branch 'dev' into adiDev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m9s
Details

Browse source
This commit is contained in:
Adisak 2026-06-15 10:59:28 +07:00
commit cf4c8a6388
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controllers/ProfileChangeNameController.ts
View file

@ -114,6 +114,7 @@ export class ProfileChangeNameController extends Controller {
profile.prefix = body.prefix ?? profile.prefix; profile.prefix = body.prefix ?? profile.prefix;
profile.rank = body.rank ?? profile.rank; profile.rank = body.rank ?? profile.rank;
profile.prefixMain = profile.rank ?? profile.prefix; profile.prefixMain = profile.rank ?? profile.prefix;
await this.profileRepository.save(profile, { data: req }); await this.profileRepository.save(profile, { data: req });
setLogDataDiff(req, { before, after: profile }); setLogDataDiff(req, { before, after: profile });

2
src/services/rabbitmq.ts
View file

@ -904,7 +904,7 @@ async function handler_org(msg: amqp.ConsumeMessage): Promise<boolean> {
posType: posTypeName, posType: posTypeName,
posLevel: posLevelName, posLevel: posLevelName,
posExecutive: posExecutiveName, posExecutive: posExecutiveName,
profileId: _null, profileId: nextHolderProfile?.id || _null,
rootDnaId: item.orgRoot?.ancestorDNA || _null, rootDnaId: item.orgRoot?.ancestorDNA || _null,
child1DnaId: item.orgChild1?.ancestorDNA || _null, child1DnaId: item.orgChild1?.ancestorDNA || _null,
child2DnaId: item.orgChild2?.ancestorDNA || _null, child2DnaId: item.orgChild2?.ancestorDNA || _null,