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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-04-05 10:27:01 +07:00
parent 14f5a082ca
commit 3de8591ce0
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/DevelopmentScholarshipController.ts
View file

@ -151,12 +151,18 @@ export class DevelopmentScholarshipController extends Controller {
.leftJoinAndSelect("developmentScholarship.posLevel", "posLevel") .leftJoinAndSelect("developmentScholarship.posLevel", "posLevel")
.leftJoinAndSelect("developmentScholarship.posType", "posType") .leftJoinAndSelect("developmentScholarship.posType", "posType")
.andWhere( .andWhere(
year != 0 && year != null && year != undefined year !== 0 && year != null && year != undefined
? "developmentScholarship.scholarshipYear = :scholarshipYear" ? "developmentScholarship.scholarshipYear = :scholarshipYear"
: "1=1", : "1=1",
{ scholarshipYear: year }, { scholarshipYear: year },
) )
.andWhere("developmentScholarship.scholarshipType = :scholarshipType", { scholarshipType: scholarshipType }) .andWhere(
scholarshipType != null && scholarshipType != undefined
?
"developmentScholarship.scholarshipType = :scholarshipType"
: "1=1",
{ scholarshipType: scholarshipType }
)
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.where( qb.where(