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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-14 17:25:38 +07:00
commit 40205a3a97
34 changed files with 442 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileEmployeeController.ts
View file

@ -975,7 +975,7 @@ export class ProfileEmployeeController extends Controller {
.leftJoinAndSelect("employeePosMaster.orgChild4", "orgChild4")
.leftJoinAndSelect("employeePosMaster.positions", "positions")
.leftJoinAndSelect("current_holder.profileSalary", "profileSalary")
.leftJoinAndSelect("current_holder.profileDiscipline", "profileDiscipline")
.leftJoinAndSelect("current_holder.profileDisciplines", "profileDisciplines")
.leftJoinAndSelect("current_holder.posLevel", "posLevel")
.leftJoinAndSelect("current_holder.posType", "posType")
.where((qb) => {
@ -1128,7 +1128,7 @@ export class ProfileEmployeeController extends Controller {
result: null,
duration: null,
isPunish:
item.current_holder.profileDiscipline.filter(
item.current_holder.profileDisciplines.filter(
(x: any) =>
new Date(
`${new Date(x.date).getFullYear()}-${String(new Date(x.date).getMonth() + 1).padStart(2, "0")}-${String(new Date(x.date).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,