fix blank row report kk1
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m40s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m40s
This commit is contained in:
parent
2fdf5e5854
commit
5a4b7c92a3
2 changed files with 80 additions and 76 deletions
|
|
@ -1385,6 +1385,10 @@ export class ProfileController extends Controller {
|
|||
}
|
||||
});
|
||||
|
||||
if (leaves.length === 0) {
|
||||
leaves.push({year:""});
|
||||
}
|
||||
|
||||
const leave2_raw = await this.profileLeaveRepository
|
||||
.createQueryBuilder("profileLeave")
|
||||
.leftJoinAndSelect("profileLeave.leaveType", "leaveType")
|
||||
|
|
@ -1730,16 +1734,6 @@ export class ProfileController extends Controller {
|
|||
});
|
||||
}
|
||||
}
|
||||
else {
|
||||
_assistances.push({
|
||||
date: "",
|
||||
position: "",
|
||||
commandName: "",
|
||||
agency: "",
|
||||
note: "",
|
||||
document: "",
|
||||
});
|
||||
}
|
||||
// Merge รักษาการ และ ช่วยราชาร
|
||||
const actposition = [..._actpositions, ..._assistances];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue