From 10aa3d34bc599232af07d8a643c9938be14cb5bf Mon Sep 17 00:00:00 2001 From: joonhoekim <26rote@gmail.com> Date: Mon, 8 Sep 2025 10:33:01 +0000 Subject: (김준회) 입찰 인터페이스 처리, 자재그룹명 매핑 수정, 자재그룹 뷰 수정, 부서별 도메인 할당시 동기화 처리, 도메인 부서 할당 다이얼로그 부서목록 스크롤 처리, 삼성중공업 사용자 global search 개선 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/admin-users/service.ts | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'lib/admin-users') diff --git a/lib/admin-users/service.ts b/lib/admin-users/service.ts index 2b6bed83..c253f481 100644 --- a/lib/admin-users/service.ts +++ b/lib/admin-users/service.ts @@ -53,15 +53,27 @@ export async function getUsers(input: GetUsersSchema) { joinOperator: input.joinOperator, }); - // (2) globalWhere + // (2) globalWhere - 선택된 컬럼 대상 검색 let globalWhere; if (input.search) { const s = `%${input.search}%`; - globalWhere = or( - ilike(userView.user_name, s), - ilike(userView.user_email, s), - ilike(userView.company_name, s) - ); + + // 검색 대상 컬럼들 + const searchableColumns = [ + userView.user_name, + userView.user_email, + userView.user_phone, + userView.employee_number, + userView.dept_name, + userView.knox_id, + ]; + + // 검색 조건 생성 + const searchConditions = searchableColumns + .filter(col => col !== undefined) + .map(col => ilike(col, s)); + + globalWhere = or(...searchConditions); } // (3) 디폴트 domainWhere = eq(userView.domain, "partners") -- cgit v1.2.3