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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2025-03-20 18:03:47 +07:00
parent 91f4c59e35
commit 8c30dc56f4
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/controllers/ProfileSalaryTempController.ts
View file

@ -29,8 +29,7 @@ import { ProfileEmployee } from "../entities/ProfileEmployee";
import permission from "../interfaces/permission";
import { OrgRevision } from "../entities/OrgRevision";
import Extension from "../interfaces/extension";
import { log } from "console";
@Route("api/v1/org/profile/salaryTemp")
@Route("api/v1/org/profile/salaryTemp")
@Tags("ProfileSalaryTemp")
@Security("bearerAuth")
export class ProfileSalaryTempController extends Controller {
@ -88,7 +87,7 @@ export class ProfileSalaryTempController extends Controller {
orgRevisionId: findRevision.id,
})
.andWhere(
statusCheckEdit != undefined && statusCheckEdit != null
statusCheckEdit != undefined && statusCheckEdit != null && statusCheckEdit.toUpperCase() != "ALL"
? "profile.statusCheckEdit = :statusCheckEdit"
: "1=1",
{
@ -640,7 +639,10 @@ export class ProfileSalaryTempController extends Controller {
@Request() req: RequestWithUser,
) {
if (type.toLocaleUpperCase() == "OFFICER") {
const salary = await this.salaryRepo.find({ where: { profileId: profileId } });
const salary = await this.salaryRepo.find({
where: { profileId: profileId },
order: { order: "ASC" }
});
if (salary.length <= 0) {
let salaryOld = await this.salaryOldRepo.find({
where: { profileId: profileId },
@ -669,7 +671,10 @@ export class ProfileSalaryTempController extends Controller {
}
return new HttpSuccess(salary);
} else {
const salary = await this.salaryRepo.find({ where: { profileEmployeeId: profileId } });
const salary = await this.salaryRepo.find({
where: { profileEmployeeId: profileId },
order: { order: "ASC" }
});
if (salary.length <= 0) {
let salaryOld = await this.salaryOldRepo.find({
where: { profileEmployeeId: profileId },