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

Merge branch 'develop' of https://github.com/Frappet/bma-ehr-kpi into develop

Browse source
This commit is contained in:
AnandaTon 2024-05-08 14:59:04 +07:00
commit fda6c9e92b
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/controllers/KpiPlanController.ts
View file

@ -405,19 +405,19 @@ export class kpiPlanController extends Controller {
if (requestBody.isAll === false) {
switch (requestBody.node) {
case 0:
condition = "kpiPlan.rootId LIKE :nodeId AND kpiPlan.child1 IS NULL";
condition = "kpiPlan.rootId LIKE :nodeId AND kpiPlan.child1Id IS NULL";
break;
case 1:
condition = "kpiPlan.child1 LIKE :nodeId AND kpiPlan.child2 IS NULL";
condition = "kpiPlan.child1Id LIKE :nodeId AND kpiPlan.child2Id IS NULL";
break;
case 2:
condition = "kpiPlan.child2 LIKE :nodeId AND kpiPlan.child3 IS NULL";
condition = "kpiPlan.child2Id LIKE :nodeId AND kpiPlan.child3Id IS NULL";
break;
case 3:
condition = "kpiPlan.child3 LIKE :nodeId AND kpiPlan.child4 IS NULL";
condition = "kpiPlan.child3Id LIKE :nodeId AND kpiPlan.child4Id IS NULL";
break;
case 4:
condition = "kpiPlan.child4 LIKE :nodeId";
condition = "kpiPlan.child4Id LIKE :nodeId";
break;
default:
break;
@ -429,16 +429,16 @@ export class kpiPlanController extends Controller {
condition = "kpiPlan.rootId LIKE :nodeId";
break;
case 1:
condition = "kpiPlan.child1 LIKE :nodeId";
condition = "kpiPlan.child1Id LIKE :nodeId";
break;
case 2:
condition = "kpiPlan.child2 LIKE :nodeId";
condition = "kpiPlan.child2Id LIKE :nodeId";
break;
case 3:
condition = "kpiPlan.child3 LIKE :nodeId";
condition = "kpiPlan.child3Id LIKE :nodeId";
break;
case 4:
condition = "kpiPlan.child4 LIKE :nodeId";
condition = "kpiPlan.child4Id LIKE :nodeId";
break;
default:
break;

18
src/controllers/KpiRoleController.ts
View file

@ -356,19 +356,19 @@ export class kpiRoleController extends Controller {
if (requestBody.isAll === false) {
switch (requestBody.node) {
case 0:
condition = "kpiRole.rootId LIKE :nodeId AND kpiRole.child1 IS NULL";
condition = "kpiRole.rootId LIKE :nodeId AND kpiRole.child1Id IS NULL";
break;
case 1:
condition = "kpiRole.child1 LIKE :nodeId AND kpiRole.child2 IS NULL";
condition = "kpiRole.child1Id LIKE :nodeId AND kpiRole.child2Id IS NULL";
break;
case 2:
condition = "kpiRole.child2 LIKE :nodeId AND kpiRole.child3 IS NULL";
condition = "kpiRole.child2Id LIKE :nodeId AND kpiRole.child3Id IS NULL";
break;
case 3:
condition = "kpiRole.child3 LIKE :nodeId AND kpiRole.child4 IS NULL";
condition = "kpiRole.child3Id LIKE :nodeId AND kpiRole.child4Id IS NULL";
break;
case 4:
condition = "kpiRole.child4 LIKE :nodeId";
condition = "kpiRole.child4Id LIKE :nodeId";
break;
default:
break;
@ -380,16 +380,16 @@ export class kpiRoleController extends Controller {
condition = "kpiRole.rootId LIKE :nodeId";
break;
case 1:
condition = "kpiRole.child1 LIKE :nodeId";
condition = "kpiRole.child1Id LIKE :nodeId";
break;
case 2:
condition = "kpiRole.child2 LIKE :nodeId";
condition = "kpiRole.child2Id LIKE :nodeId";
break;
case 3:
condition = "kpiRole.child3 LIKE :nodeId";
condition = "kpiRole.child3Id LIKE :nodeId";
break;
case 4:
condition = "kpiRole.child4 LIKE :nodeId";
condition = "kpiRole.child4Id LIKE :nodeId";
break;
default:
break;