diff --git a/src/controllers/PermissionOrgController.ts b/src/controllers/PermissionOrgController.ts index d261ba65..2bebf833 100644 --- a/src/controllers/PermissionOrgController.ts +++ b/src/controllers/PermissionOrgController.ts @@ -103,9 +103,17 @@ export class PermissionOrgController extends Controller { } else if (searchField == "posNo") { queryLike = `CONCAT( IFNULL(orgChild4.orgChild4ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild3.orgChild3ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild2.orgChild2ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild1.orgChild1ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgRoot.orgRootShortName, ''), IFNULL(current_holders.posMasterNo , '') ) LIKE :keyword`; @@ -130,6 +138,7 @@ export class PermissionOrgController extends Controller { keyword: `%${searchKeyword}%`, }, ) + .orderBy("current_holders.posMasterNo", "ASC") .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount(); @@ -275,9 +284,17 @@ export class PermissionOrgController extends Controller { } else if (requestBody.searchField == "posNo") { queryLike = `CONCAT( IFNULL(orgChild4.orgChild4ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild3.orgChild3ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild2.orgChild2ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild1.orgChild1ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgRoot.orgRootShortName, ''), IFNULL(current_holders.posMasterNo , '') ) LIKE :keyword`; @@ -308,6 +325,7 @@ export class PermissionOrgController extends Controller { keyword: `%${requestBody.searchKeyword}%`, }, ) + .orderBy("current_holders.posMasterNo", "ASC") .skip((requestBody.page - 1) * requestBody.pageSize) .take(requestBody.pageSize) .getManyAndCount(); diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 2345c3ba..f804b436 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -3726,13 +3726,21 @@ export class ProfileController extends Controller { queryLike = "profile.position LIKE :keyword"; } else if (searchField == "posNo") { queryLike = `CONCAT( - IFNULL(orgChild4.orgChild4ShortName, ''), - IFNULL(orgChild3.orgChild3ShortName, ''), - IFNULL(orgChild2.orgChild2ShortName, ''), - IFNULL(orgChild1.orgChild1ShortName, ''), - IFNULL(orgRoot.orgRootShortName, ''), - IFNULL(current_holders.posMasterNo , '') - ) LIKE :keyword`; + IFNULL(orgChild4.orgChild4ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( + IFNULL(orgChild3.orgChild3ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( + IFNULL(orgChild2.orgChild2ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( + IFNULL(orgChild1.orgChild1ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( + IFNULL(orgRoot.orgRootShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword`; } let nodeCondition = "1=1"; let nodeAll = ""; @@ -3803,6 +3811,7 @@ export class ProfileController extends Controller { .andWhere(nodeCondition, { nodeId: nodeId, }) + .orderBy("current_holders.posMasterNo", "ASC") .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount(); @@ -4072,9 +4081,17 @@ export class ProfileController extends Controller { } else if (searchField == "posNo") { queryLike = `CONCAT( IFNULL(orgChild4.orgChild4ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild3.orgChild3ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild2.orgChild2ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgChild1.orgChild1ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( IFNULL(orgRoot.orgRootShortName, ''), IFNULL(current_holders.posMasterNo , '') ) LIKE :keyword`; @@ -4198,6 +4215,7 @@ export class ProfileController extends Controller { .andWhere(nodeCondition, { nodeId: nodeId, }) + .orderBy("current_holders.posMasterNo", "ASC") .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount(); diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 9611c8c9..be0acd5f 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -1386,13 +1386,21 @@ export class ProfileEmployeeController extends Controller { queryLike = "profileEmployee.position LIKE :keyword"; } else if (searchField == "posNo") { queryLike = `CONCAT( - IFNULL(orgChild4.orgChild4ShortName, ''), - IFNULL(orgChild3.orgChild3ShortName, ''), - IFNULL(orgChild2.orgChild2ShortName, ''), - IFNULL(orgChild1.orgChild1ShortName, ''), - IFNULL(orgRoot.orgRootShortName, ''), - IFNULL(current_holders.posMasterNo , '') - ) LIKE :keyword`; + IFNULL(orgChild4.orgChild4ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( + IFNULL(orgChild3.orgChild3ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( + IFNULL(orgChild2.orgChild2ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( + IFNULL(orgChild1.orgChild1ShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword OR CONCAT( + IFNULL(orgRoot.orgRootShortName, ''), + IFNULL(current_holders.posMasterNo , '') + ) LIKE :keyword`; } let nodeCondition = "1=1"; let nodeAll = ""; @@ -1516,6 +1524,7 @@ export class ProfileEmployeeController extends Controller { .andWhere(nodeCondition, { nodeId: nodeId, }) + .orderBy("current_holders.posMasterNo", "ASC") .skip((page - 1) * pageSize) .take(pageSize) .getManyAndCount();