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

Merge branch 'develop' into adiDev

Browse source 
# Conflicts:
#	src/controllers/ProfileSalaryTempController.ts
This commit is contained in:
AdisakKanthawilang 2025-03-21 10:30:59 +07:00
commit f033205e1d
1 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/controllers/ProfileSalaryTempController.ts
View file

@ -87,7 +87,9 @@ export class ProfileSalaryTempController extends Controller {
orgRevisionId: findRevision.id, orgRevisionId: findRevision.id,
}) })
.andWhere( .andWhere(
statusCheckEdit != undefined && statusCheckEdit != null && statusCheckEdit.toUpperCase() != "ALL" statusCheckEdit != undefined &&
statusCheckEdit != null &&
statusCheckEdit.toUpperCase() != "ALL"
? "profile.statusCheckEdit = :statusCheckEdit" ? "profile.statusCheckEdit = :statusCheckEdit"
: "1=1", : "1=1",
{ {
@ -273,7 +275,7 @@ export class ProfileSalaryTempController extends Controller {
orgRevisionId: root == null ? null : root.orgRevisionId, orgRevisionId: root == null ? null : root.orgRevisionId,
org: `${_child4}${_child3}${_child2}${_child1}${root?.orgRootName ?? ""}`, org: `${_child4}${_child3}${_child2}${_child1}${root?.orgRootName ?? ""}`,
statusCheckEdit: _data.statusCheckEdit, statusCheckEdit: _data.statusCheckEdit,
type: "OFFICER" type: "OFFICER",
}; };
}), }),
); );
@ -540,7 +542,7 @@ export class ProfileSalaryTempController extends Controller {
child4ShortName: _data.child4ShortNameTemp ? _data.child4ShortNameTemp : null, child4ShortName: _data.child4ShortNameTemp ? _data.child4ShortNameTemp : null,
org: `${_child4}${_child3}${_child2}${_child1}${root?.orgRootName ?? ""}`, org: `${_child4}${_child3}${_child2}${_child1}${root?.orgRootName ?? ""}`,
statusCheckEdit: _data.statusCheckEdit, statusCheckEdit: _data.statusCheckEdit,
type: "EMPLOYEE" type: "EMPLOYEE",
}; };
}), }),
); );
@ -640,10 +642,8 @@ export class ProfileSalaryTempController extends Controller {
) { ) {
if (type.toLocaleUpperCase() == "OFFICER") { if (type.toLocaleUpperCase() == "OFFICER") {
const salary = await this.salaryRepo.find({ const salary = await this.salaryRepo.find({
where: { where: { profileId: profileId },
profileId: profileId, order: { order: "ASC" },
},
order: { order: "ASC" }
}); });
if (salary.length <= 0) { if (salary.length <= 0) {
@ -676,7 +676,7 @@ export class ProfileSalaryTempController extends Controller {
} else { } else {
const salary = await this.salaryRepo.find({ const salary = await this.salaryRepo.find({
where: { profileEmployeeId: profileId }, where: { profileEmployeeId: profileId },
order: { order: "ASC" } order: { order: "ASC" },
}); });
if (salary.length <= 0) { if (salary.length <= 0) {
let salaryOld = await this.salaryOldRepo.find({ let salaryOld = await this.salaryOldRepo.find({
@ -756,8 +756,6 @@ export class ProfileSalaryTempController extends Controller {
} }
} }
/** /**
* API สร้างตำแหน่งเงินเดือน * API สร้างตำแหน่งเงินเดือน
* *