fix bug แก้ชื่อ
This commit is contained in:
parent
291d3199d2
commit
fcbbdbf4d1
16 changed files with 50 additions and 232 deletions
|
|
@ -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`,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue