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

fix search posNo

Browse source
This commit is contained in:
AdisakKanthawilang 2024-12-03 13:53:03 +07:00
parent 0b9818955c
commit bbcd0a5341
3 changed files with 68 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/controllers/PermissionOrgController.ts
View file

@ -106,22 +106,23 @@ export class PermissionOrgController extends Controller {
} else if (searchField == "position") { } else if (searchField == "position") {
queryLike = "profile.position LIKE :keyword"; queryLike = "profile.position LIKE :keyword";
} else if (searchField == "posNo") { } else if (searchField == "posNo") {
queryLike = `CONCAT( queryLike = `
IFNULL(orgChild4.orgChild4ShortName, ''), IF(current_holders.orgChild4Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild4.orgChild4ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild3.orgChild3ShortName, ''), IF(current_holders.orgChild3Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild3.orgChild3ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild2.orgChild2ShortName, ''), IF(current_holders.orgChild2Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild2.orgChild2ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild1.orgChild1ShortName, ''), IF(current_holders.orgChild1Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild1.orgChild1ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgRoot.orgRootShortName, ''), IF(current_holders.orgChild1Id IS NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild1.orgChild1ShortName, current_holders.posMasterNo), ''
) LIKE :keyword`; ) LIKE :keyword
`;
} }
const findRevision = await this.orgRevisionRepository.findOne({ const findRevision = await this.orgRevisionRepository.findOne({
where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false }, where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },

66
src/controllers/ProfileController.ts
View file

@ -3757,22 +3757,23 @@ export class ProfileController extends Controller {
} else if (searchField == "position") { } else if (searchField == "position") {
queryLike = "profile.position LIKE :keyword"; queryLike = "profile.position LIKE :keyword";
} else if (searchField == "posNo") { } else if (searchField == "posNo") {
queryLike = `CONCAT( queryLike = `
IFNULL(orgChild4.orgChild4ShortName, ''), IF(current_holders.orgChild4Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild4.orgChild4ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild3.orgChild3ShortName, ''), IF(current_holders.orgChild3Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild3.orgChild3ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild2.orgChild2ShortName, ''), IF(current_holders.orgChild2Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild2.orgChild2ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild1.orgChild1ShortName, ''), IF(current_holders.orgChild1Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild1.orgChild1ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgRoot.orgRootShortName, ''), IF(current_holders.orgChild1Id IS NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild1.orgChild1ShortName, current_holders.posMasterNo), ''
) LIKE :keyword`; ) LIKE :keyword
`;
} }
let nodeCondition = "1=1"; let nodeCondition = "1=1";
let nodeAll = ""; let nodeAll = "";
@ -4116,22 +4117,23 @@ export class ProfileController extends Controller {
} else if (searchField == "position") { } else if (searchField == "position") {
queryLike = "profile.position LIKE :keyword"; queryLike = "profile.position LIKE :keyword";
} else if (searchField == "posNo") { } else if (searchField == "posNo") {
queryLike = `CONCAT( queryLike = `
IFNULL(orgChild4.orgChild4ShortName, ''), IF(current_holders.orgChild4Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild4.orgChild4ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild3.orgChild3ShortName, ''), IF(current_holders.orgChild3Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild3.orgChild3ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild2.orgChild2ShortName, ''), IF(current_holders.orgChild2Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild2.orgChild2ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild1.orgChild1ShortName, ''), IF(current_holders.orgChild1Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild1.orgChild1ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgRoot.orgRootShortName, ''), IF(current_holders.orgChild1Id IS NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild1.orgChild1ShortName, current_holders.posMasterNo), ''
) LIKE :keyword`; ) LIKE :keyword
`;
} }
let nodeCondition = "1=1"; let nodeCondition = "1=1";
let nodeAll = ""; let nodeAll = "";

33
src/controllers/ProfileEmployeeController.ts
View file

@ -1385,22 +1385,23 @@ export class ProfileEmployeeController extends Controller {
} else if (searchField == "position") { } else if (searchField == "position") {
queryLike = "profileEmployee.position LIKE :keyword"; queryLike = "profileEmployee.position LIKE :keyword";
} else if (searchField == "posNo") { } else if (searchField == "posNo") {
queryLike = `CONCAT( queryLike = `
IFNULL(orgChild4.orgChild4ShortName, ''), IF(current_holders.orgChild4Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild4.orgChild4ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild3.orgChild3ShortName, ''), IF(current_holders.orgChild3Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild3.orgChild3ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild2.orgChild2ShortName, ''), IF(current_holders.orgChild2Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild2.orgChild2ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgChild1.orgChild1ShortName, ''), IF(current_holders.orgChild1Id IS NOT NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild1.orgChild1ShortName, current_holders.posMasterNo), ''
) LIKE :keyword OR CONCAT( ) LIKE :keyword OR
IFNULL(orgRoot.orgRootShortName, ''), IF(current_holders.orgChild1Id IS NULL,
IFNULL(current_holders.posMasterNo , '') CONCAT(orgChild1.orgChild1ShortName, current_holders.posMasterNo), ''
) LIKE :keyword`; ) LIKE :keyword
`;
} }
let nodeCondition = "1=1"; let nodeCondition = "1=1";
let nodeAll = ""; let nodeAll = "";