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

Merge branch 'develop-Bright' into develop
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m14s
Details

Browse source
This commit is contained in:
harid 2026-06-17 17:15:01 +07:00
commit 51d447109e
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ProfileChangeNameController.ts
View file

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

8
src/controllers/ProfileChangeNameEmployeeController.ts
View file

@ -120,8 +120,8 @@ export class ProfileChangeNameEmployeeController extends Controller {
// profile.prefix = body.prefix ?? profile.prefix; //old
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.prefix;
profile.prefixMain = body.prefix ?? profile.prefix;
profile.prefix = body.rank && body.rank.length > 0 ? body.rank : body.prefix ?? profile.prefix;
await this.profileEmployeeRepo.save(profile, { data: req });
setLogDataDiff(req, { before, after: profile });
@ -196,8 +196,8 @@ export class ProfileChangeNameEmployeeController extends Controller {
// profile.prefix = body.prefix ?? profile.prefix; //old
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.prefix;
profile.prefixMain = body.prefix ?? profile.prefix;
profile.prefix = body.rank && body.rank.length > 0 ? body.rank : body.prefix ?? profile.prefix;
await this.profileEmployeeRepo.save(profile);
}

8
src/controllers/ProfileChangeNameEmployeeTempController.ts
View file

@ -111,8 +111,8 @@ export class ProfileChangeNameEmployeeTempController extends Controller {
// profile.prefix = body.prefix ?? profile.prefix; //old
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.prefix;
profile.prefixMain = body.prefix ?? profile.prefix;
profile.prefix = body.rank && body.rank.length > 0 ? body.rank : body.prefix ?? profile.prefix;
await this.profileEmployeeRepo.save(profile, { data: req });
setLogDataDiff(req, { before, after: profile });
@ -184,8 +184,8 @@ export class ProfileChangeNameEmployeeTempController extends Controller {
// profile.prefix = body.prefix ?? profile.prefix; //old
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.prefix;
profile.prefixMain = body.prefix ?? profile.prefix;
profile.prefix = body.rank && body.rank.length > 0 ? body.rank : body.prefix ?? profile.prefix;
await this.profileEmployeeRepo.save(profile);
}