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 59s
Details

Browse source
This commit is contained in:
harid 2026-01-28 11:02:38 +07:00
commit ecd002456e
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/controllers/ProfileController.ts
View file

@ -7281,13 +7281,13 @@ export class ProfileController extends Controller {
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary",
// "profileSalary",
],
order: {
profileSalary: {
order: "DESC",
},
},
// order: {
// profileSalary: {
// order: "DESC",
// },
// },
});
if (!profile) {
const profile = await this.profileEmpRepo.findOne({
@ -7301,13 +7301,13 @@ export class ProfileController extends Controller {
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary",
// "profileSalary",
],
order: {
profileSalary: {
order: "DESC",
},
},
// order: {
// profileSalary: {
// order: "DESC",
// },
// },
});
if (!profile) {
if (request.user.role.includes("SUPER_ADMIN")) {

12
src/controllers/ProfileEmployeeController.ts
View file

@ -3494,13 +3494,13 @@ export class ProfileEmployeeController extends Controller {
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary",
// "profileSalary",
],
order: {
profileSalary: {
order: "DESC",
},
},
// order: {
// profileSalary: {
// order: "DESC",
// },
// },
});
if (!profile) {
if (request.user.role.includes("SUPER_ADMIN")) {

12
src/controllers/ProfileEmployeeTempController.ts
View file

@ -2071,13 +2071,13 @@ export class ProfileEmployeeTempController extends Controller {
"current_holders.orgChild2",
"current_holders.orgChild3",
"current_holders.orgChild4",
"profileSalary",
// "profileSalary",
],
order: {
profileSalary: {
order: "DESC",
},
},
// order: {
// profileSalary: {
// order: "DESC",
// },
// },
});
if (!profile) {
if (request.user.role.includes("SUPER_ADMIN")) {