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

filter education

Browse source
This commit is contained in:
mamoss 2025-09-08 00:10:59 +07:00
parent e7798402eb
commit 332a96efb3
4 changed files with 187 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/ProfileController.ts
View file

@ -86,6 +86,7 @@ import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory";
import { ProfileAssistance } from "../entities/ProfileAssistance";
import { CommandRecive } from "../entities/CommandRecive";
import { EmployeePosMaster } from "../entities/EmployeePosMaster";
import { getTopDegrees } from "../services/PositionService";
@Route("api/v1/org/profile")
@Tags("Profile")
@Security("bearerAuth")
@ -6292,7 +6293,9 @@ export class ProfileController extends Controller {
// : undefined,
// })
.where("current_holders.orgRevisionId = :orgRevisionId", {
orgRevisionId: (await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } }))?.id
orgRevisionId: (
await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true } })
)?.id,
})
.andWhere(
_data.root != undefined && _data.root != null
@ -8148,7 +8151,7 @@ export class ProfileController extends Controller {
salary: profile ? profile.amount : null,
education:
profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
? await getTopDegrees(profile.profileEducations)
: "-",
statusCheckEdit: profile.statusCheckEdit,
isEdit: permissionProflile?.isEdit ?? false,
@ -8345,7 +8348,7 @@ export class ProfileController extends Controller {
mouthSalaryAmount: profile ? profile.mouthSalaryAmount : null,
education:
profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
? await getTopDegrees(profile.profileEducations)
: "",
dateAppoint: profile.dateAppoint,
avatarUrl:
@ -8497,7 +8500,7 @@ export class ProfileController extends Controller {
salary: profile.amount,
education:
profile && profile.profileEducations.length > 0
? `${profile.profileEducations[0].degree ?? ""} ${profile.profileEducations[0].field ?? ""}`
? await getTopDegrees(profile.profileEducations)
: "-",
};