Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
This commit is contained in:
commit
73dfffafea
1 changed files with 4 additions and 4 deletions
|
|
@ -517,8 +517,8 @@ export class OrganizationUnauthorizeController extends Controller {
|
||||||
new Date(
|
new Date(
|
||||||
`${new Date(item.disCriplineDate).getFullYear()}-${String(new Date(item.disCriplineDate).getMonth() + 1).padStart(2, "0")}-${String(new Date(item.disCriplineDate).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,
|
`${new Date(item.disCriplineDate).getFullYear()}-${String(new Date(item.disCriplineDate).getMonth() + 1).padStart(2, "0")}-${String(new Date(item.disCriplineDate).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,
|
||||||
) <= datePeriodEnd
|
) <= datePeriodEnd
|
||||||
? true
|
? false
|
||||||
: false,
|
: true,
|
||||||
isSuspension: item.dateRetire == null ? false : true,
|
isSuspension: item.dateRetire == null ? false : true,
|
||||||
isAbsent: item.profileDisciplineId ? true : false,
|
isAbsent: item.profileDisciplineId ? true : false,
|
||||||
isLeave: item.profileLeaveId ? true : false,
|
isLeave: item.profileLeaveId ? true : false,
|
||||||
|
|
@ -971,8 +971,8 @@ export class OrganizationUnauthorizeController extends Controller {
|
||||||
new Date(
|
new Date(
|
||||||
`${new Date(item.disCriplineDate).getFullYear()}-${String(new Date(item.disCriplineDate).getMonth() + 1).padStart(2, "0")}-${String(new Date(item.disCriplineDate).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,
|
`${new Date(item.disCriplineDate).getFullYear()}-${String(new Date(item.disCriplineDate).getMonth() + 1).padStart(2, "0")}-${String(new Date(item.disCriplineDate).getDate() + 1).padStart(2, "0")}T00:00:00.000Z`,
|
||||||
) <= datePeriodEnd
|
) <= datePeriodEnd
|
||||||
? true
|
? false
|
||||||
: false,
|
: true,
|
||||||
isSuspension: item.dateRetire == null ? false : true,
|
isSuspension: item.dateRetire == null ? false : true,
|
||||||
isAbsent: item.profileDisciplineId ? true : false,
|
isAbsent: item.profileDisciplineId ? true : false,
|
||||||
isLeave: item.profileLeaveId ? true : false,
|
isLeave: item.profileLeaveId ? true : false,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue