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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m11s
Details

Browse source
This commit is contained in:
harid 2026-02-19 15:15:49 +07:00
commit a45faaff8f
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/SalaryPeriodController.ts
View file

@ -2300,7 +2300,8 @@ export class SalaryPeriodController extends Controller {
_data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null
? `child1Id IN (:...child1)`
: `child1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
// : `child1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: `child1Id is null`
: "1=1",
{
child1: _data.child1,

6
src/interfaces/permission.ts
View file

@ -96,8 +96,10 @@ class CheckAuth {
};
} else if (privilege == "PARENT") {
data = {
root: [x.orgRootId],
child1: [null],
// root: [x.orgRootId],
// child1: [null],
root: null,
child1: null,
child2: null,
child3: null,
child4: null,