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

fix #2570

Browse source
This commit is contained in:
harid 2026-06-17 16:53:26 +07:00
parent db36b250e3
commit 12da167794
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileChangeNameController.ts
View file

@ -115,7 +115,7 @@ export class ProfileChangeNameController extends Controller {
profile.rank = body.rank ?? profile.rank;
// profile.prefixMain = profile.rank ?? profile.prefix; // old
profile.prefixMain = profile.prefix;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefixMain;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefix;
await this.profileRepository.save(profile, { data: req });
setLogDataDiff(req, { before, after: profile });
@ -191,7 +191,7 @@ export class ProfileChangeNameController extends Controller {
profile.rank = body.rank ?? profile.rank;
// profile.prefixMain = profile.rank ?? profile.prefix; // old
profile.prefixMain = profile.prefix;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefixMain;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefix;
await this.profileRepository.save(profile, { data: req });
setLogDataDiff(req, { before: before_profile, after: profile });
}

4
src/controllers/ProfileChangeNameEmployeeController.ts
View file

@ -121,7 +121,7 @@ export class ProfileChangeNameEmployeeController extends Controller {
profile.rank = body.rank ?? profile.rank;
// profile.prefixMain = profile.rank ?? profile.prefix; // old
profile.prefixMain = profile.prefix;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefixMain;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefix;
await this.profileEmployeeRepo.save(profile, { data: req });
setLogDataDiff(req, { before, after: profile });
@ -197,7 +197,7 @@ export class ProfileChangeNameEmployeeController extends Controller {
profile.rank = body.rank ?? profile.rank;
// profile.prefixMain = profile.rank ?? profile.prefix; // old
profile.prefixMain = profile.prefix;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefixMain;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefix;
await this.profileEmployeeRepo.save(profile);
}

4
src/controllers/ProfileChangeNameEmployeeTempController.ts
View file

@ -112,7 +112,7 @@ export class ProfileChangeNameEmployeeTempController extends Controller {
profile.rank = body.rank ?? profile.rank;
// profile.prefixMain = profile.rank ?? profile.prefix; // old
profile.prefixMain = profile.prefix;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefixMain;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefix;
await this.profileEmployeeRepo.save(profile, { data: req });
setLogDataDiff(req, { before, after: profile });
@ -185,7 +185,7 @@ export class ProfileChangeNameEmployeeTempController extends Controller {
profile.rank = body.rank ?? profile.rank;
// profile.prefixMain = profile.rank ?? profile.prefix; // old
profile.prefixMain = profile.prefix;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefixMain;
profile.prefix = profile.rank && profile.rank.length > 0 ? profile.rank : profile.prefix;
await this.profileEmployeeRepo.save(profile);
}

3
src/controllers/ProfileController.ts
View file

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

2
src/controllers/ProfileEmployeeController.ts
View file

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