Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

This commit is contained in:
mamoss 2025-05-14 17:07:11 +07:00
commit 93c65581fa

View file

@ -1391,7 +1391,9 @@ export class OrganizationDotnetController extends Controller {
x.orgRevision?.orgRevisionIsCurrent == true,
)?.orgChild4?.ancestorDNA ?? null,
commander: fullname,
posLevel: profile.posLevel?.posLevelName ?? null,
posLevel: profile.posType?.posTypeShortName && profile.posLevel?.posLevelName
? `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}`
: profile.posType?.posTypeShortName || profile.posLevel?.posLevelName || "",
posType: profile.posType?.posTypeName ?? null,
profileSalary: profile.profileSalary.length > 0 ? profile.profileSalary[0] : null,
profileInsignia: profile.profileInsignias.length > 0 ? profile.profileInsignias[0] : null,