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
This commit is contained in:
AdisakKanthawilang 2024-05-17 11:09:49 +07:00
commit 5361184bfd
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileSalaryEmployeeController.ts
View file

@ -133,7 +133,7 @@ export class ProfileSalaryEmployeeController extends Controller {
const sourceOrder = source_item.order; const sourceOrder = source_item.order;
if (direction.trim().toUpperCase() == "UP") { if (direction.trim().toUpperCase() == "UP") {
const dest_item = await this.salaryRepo.findOne({ const dest_item = await this.salaryRepo.findOne({
where: { profileId: source_item.profileId, order: LessThan(sourceOrder) }, where: { profileEmployeeId: source_item.profileEmployeeId, order: LessThan(sourceOrder) },
order: { order: "DESC" }, order: { order: "DESC" },
}); });
if (dest_item == null) return new HttpSuccess(); if (dest_item == null) return new HttpSuccess();
@ -143,7 +143,7 @@ export class ProfileSalaryEmployeeController extends Controller {
await Promise.all([this.salaryRepo.save(source_item), this.salaryRepo.save(dest_item)]); await Promise.all([this.salaryRepo.save(source_item), this.salaryRepo.save(dest_item)]);
} else { } else {
const dest_item = await this.salaryRepo.findOne({ const dest_item = await this.salaryRepo.findOne({
where: { profileId: source_item.profileId, order: MoreThan(sourceOrder) }, where: { profileEmployeeId: source_item.profileEmployeeId, order: MoreThan(sourceOrder) },
order: { order: "ASC" }, order: { order: "ASC" },
}); });
if (dest_item == null) return new HttpSuccess(); if (dest_item == null) return new HttpSuccess();