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

Fix Invalid รายการประเมินผลการปฏิบัติราชการระดับบุคคล (KPI) ไม่แสดงตามสิทธิ์ #19

Browse source
This commit is contained in:
Bright 2025-06-19 10:30:55 +07:00
parent 5c1e691424
commit 08a9f755c7
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/KpiUserDevelopmentController.ts
View file

@ -377,8 +377,8 @@ export class KpiUserDevelopmentController extends Controller {
.andWhere( .andWhere(
_data.root != undefined && _data.root != null _data.root != undefined && _data.root != null
? _data.root[0] != null ? _data.root[0] != null
? `kpiUserEvaluation.rootDnaId IN (:...root)` ? `kpiUserEvaluation.orgDnaId IN (:...root)`
: `kpiUserEvaluation.rootDnaId is null` : `kpiUserEvaluation.orgDnaId is null`
: "1=1", : "1=1",
{ {
root: _data.root, root: _data.root,

10
src/controllers/KpiUserEvaluationController.ts
View file

@ -607,6 +607,11 @@ export class KpiUserEvaluationController extends Controller {
kpiUserEvaluation.child3Id = x.child3Id; kpiUserEvaluation.child3Id = x.child3Id;
kpiUserEvaluation.child4 = x.child4; kpiUserEvaluation.child4 = x.child4;
kpiUserEvaluation.child4Id = x.child4Id; kpiUserEvaluation.child4Id = x.child4Id;
kpiUserEvaluation.orgDnaId = x.rootDnaId;
kpiUserEvaluation.child1DnaId = x.child1DnaId;
kpiUserEvaluation.child2DnaId = x.child2DnaId;
kpiUserEvaluation.child3DnaId = x.child3DnaId;
kpiUserEvaluation.child4DnaId = x.child4DnaId;
isProbation = x.isProbation; isProbation = x.isProbation;
}) })
.catch(() => { .catch(() => {
@ -635,6 +640,11 @@ export class KpiUserEvaluationController extends Controller {
kpiUserEvaluation.child3Id = x.child3Id; kpiUserEvaluation.child3Id = x.child3Id;
kpiUserEvaluation.child4 = x.child4; kpiUserEvaluation.child4 = x.child4;
kpiUserEvaluation.child4Id = x.child4Id; kpiUserEvaluation.child4Id = x.child4Id;
kpiUserEvaluation.orgDnaId = x.rootDnaId;
kpiUserEvaluation.child1DnaId = x.child1DnaId;
kpiUserEvaluation.child2DnaId = x.child2DnaId;
kpiUserEvaluation.child3DnaId = x.child3DnaId;
kpiUserEvaluation.child4DnaId = x.child4DnaId;
isProbation = x.isProbation; isProbation = x.isProbation;
}) })
.catch(() => { .catch(() => {