hrms-bangkok/hrms-api-development
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-04-04 10:22:31 +07:00
commit 786f0d51c8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/DevelopmentHistoryController.ts
View file

@ -192,7 +192,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
.leftJoinAndSelect("developmentHistory.development", "development") .leftJoinAndSelect("developmentHistory.development", "development")
.leftJoinAndSelect("developmentHistory.posLevel", "posLevel") .leftJoinAndSelect("developmentHistory.posLevel", "posLevel")
.leftJoinAndSelect("developmentHistory.posType", "posType") .leftJoinAndSelect("developmentHistory.posType", "posType")
.andWhere("development.year = :year", { year: year }) .andWhere(year != 0 || year != null ? "development.year = :year" : "1=1", { year: year })
.andWhere("developmentHistory.type = :type", { type: type }) .andWhere("developmentHistory.type = :type", { type: type })
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
@ -245,7 +245,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
}, },
) )
.orWhere( .orWhere(
keyword != null && keyword != "" keyword != null && keyword != ""
? "posType.posTypeName LIKE :keyword" ? "posType.posTypeName LIKE :keyword"
: "1=1", : "1=1",
{ {