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

revert
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m2s
Details

Browse source
This commit is contained in:
harid 2026-06-12 18:02:54 +07:00
parent 8232c6696e
commit 7920832c5c
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/ProfileChangeNameController.ts
View file

@ -111,14 +111,9 @@ export class ProfileChangeNameController extends Controller {
setLogDataDiff(req, { before, after: history }); setLogDataDiff(req, { before, after: history });
profile.firstName = body.firstName ?? profile.firstName; profile.firstName = body.firstName ?? profile.firstName;
profile.lastName = body.lastName ?? profile.lastName; profile.lastName = body.lastName ?? profile.lastName;
//old profile.prefix = body.prefix ?? profile.prefix;
// profile.prefix = body.prefix ?? profile.prefix;
// profile.rank = body.rank ?? profile.rank;
// profile.prefixMain = profile.rank ?? profile.prefix;
//new
profile.prefixMain = profile.prefix;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefix;
profile.rank = body.rank ?? profile.rank; profile.rank = body.rank ?? profile.rank;
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 });

6
src/controllers/ProfileController.ts
View file

@ -5800,12 +5800,8 @@ export class ProfileController extends Controller {
Object.assign(record, body); Object.assign(record, body);
record.dateRetireLaw = calculateRetireLaw(record.birthDate); record.dateRetireLaw = calculateRetireLaw(record.birthDate);
//old
// record.prefixMain = record.prefix;
// record.prefix = record.rank && record.rank.length > 0 ? record.rank : record.prefixMain;
//new
record.prefixMain = record.prefix; record.prefixMain = record.prefix;
record.prefix = record.rank && record.rank.length > 0 ? record.rank : record.prefix; record.prefix = record.rank && record.rank.length > 0 ? record.rank : record.prefixMain;
record.createdUserId = request.user.sub; record.createdUserId = request.user.sub;
record.createdFullName = request.user.name; record.createdFullName = request.user.name;
record.createdAt = new Date(); record.createdAt = new Date();