diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 1f42706b..67820788 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -1400,22 +1400,22 @@ export class ProfileController extends Controller { keyword: `%${body.keyword}%`, }, ) - .orWhere( - body.keyword != null && body.keyword != "" - ? "viewDirectorActing.posLevel LIKE :keyword" - : "1=1", - { - keyword: `%${body.keyword}%`, - }, - ) - .orWhere( - body.keyword != null && body.keyword != "" - ? "viewDirectorActing.posType LIKE :keyword" - : "1=1", - { - keyword: `%${body.keyword}%`, - }, - ) + // .orWhere( + // body.keyword != null && body.keyword != "" + // ? "viewDirectorActing.posLevel LIKE :keyword" + // : "1=1", + // { + // keyword: `%${body.keyword}%`, + // }, + // ) + // .orWhere( + // body.keyword != null && body.keyword != "" + // ? "viewDirectorActing.posType LIKE :keyword" + // : "1=1", + // { + // keyword: `%${body.keyword}%`, + // }, + // ) .orWhere( body.keyword != null && body.keyword != "" ? "viewDirectorActing.actFullName LIKE :keyword" @@ -1423,6 +1423,22 @@ export class ProfileController extends Controller { { keyword: `%${body.keyword}%`, }, + ) + .orWhere( + body.keyword != null && body.keyword != "" + ? "CONCAT(viewDirectorActing.posType, ' (', viewDirectorActing.posLevel, ')') LIKE :keyword" + : "1=1", + { + keyword: `%${body.keyword}%`, + }, + ) + .orWhere( + body.keyword != null && body.keyword != "" + ? "viewDirectorActing.posNo LIKE :keyword" + : "1=1", + { + keyword: `%${body.keyword}%`, + }, ); }), ) @@ -1477,17 +1493,33 @@ export class ProfileController extends Controller { keyword: `%${body.keyword}%`, }, ) + // .orWhere( + // body.keyword != null && body.keyword != "" + // ? "viewDirector.posLevel LIKE :keyword" + // : "1=1", + // { + // keyword: `%${body.keyword}%`, + // }, + // ) + // .orWhere( + // body.keyword != null && body.keyword != "" + // ? "viewDirector.posType LIKE :keyword" + // : "1=1", + // { + // keyword: `%${body.keyword}%`, + // }, + // ) .orWhere( body.keyword != null && body.keyword != "" - ? "viewDirector.posLevel LIKE :keyword" - : "1=1", - { - keyword: `%${body.keyword}%`, - }, + ? "CONCAT(viewDirector.posType, ' (', viewDirector.posLevel, ')') LIKE :keyword" + : "1=1", + { + keyword: `%${body.keyword}%`, + }, ) .orWhere( body.keyword != null && body.keyword != "" - ? "viewDirector.posType LIKE :keyword" + ? "viewDirector.posNo LIKE :keyword" : "1=1", { keyword: `%${body.keyword}%`,