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

เงินเดือนลูกจ้าง

Browse source
This commit is contained in:
kittapath 2025-01-21 10:57:40 +07:00
parent d18d28cb5b
commit 2ab006331f
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/ProfileEmployeeController.ts
View file

@ -3368,11 +3368,12 @@ export class ProfileEmployeeController extends Controller {
.where((qb) => { .where((qb) => {
if (body.rootId) { if (body.rootId) {
qb.andWhere("employeePosMaster.orgRootId = :rootId", { rootId: body.rootId }); qb.andWhere("employeePosMaster.orgRootId = :rootId", { rootId: body.rootId });
} else {
qb.andWhere("employeePosMaster.orgRevisionId = :orgRevisionId", {
orgRevisionId: findRevision?.id,
});
} }
qb.andWhere("employeePosMaster.current_holderId IS NOT NULL"); qb.andWhere("employeePosMaster.current_holderId IS NOT NULL");
qb.andWhere("employeePosMaster.orgRevisionId = :orgRevisionId", {
orgRevisionId: findRevision?.id,
});
}) })
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {

7
src/controllers/ProfileEmployeeTempController.ts
View file

@ -2686,11 +2686,12 @@ export class ProfileEmployeeTempController extends Controller {
.where((qb) => { .where((qb) => {
if (body.rootId) { if (body.rootId) {
qb.andWhere("employeePosMaster.orgRootId = :rootId", { rootId: body.rootId }); qb.andWhere("employeePosMaster.orgRootId = :rootId", { rootId: body.rootId });
} else {
qb.andWhere("employeePosMaster.orgRevisionId = :orgRevisionId", {
orgRevisionId: findRevision?.id,
});
} }
qb.andWhere("employeePosMaster.current_holderId IS NOT NULL"); qb.andWhere("employeePosMaster.current_holderId IS NOT NULL");
qb.andWhere("employeePosMaster.orgRevisionId = :orgRevisionId", {
orgRevisionId: findRevision?.id,
});
}) })
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {