From a8c7095685e730c1890b442c2fb46ba8fc54dd35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 25 Jun 2025 11:40:52 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=82=AC=EC=9B=90=ED=98=84=ED=99=A9?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mappers/researcher/ResearcherMapper.xml | 8 ++++---- admin/src/main/resources/templates/researcher/detail.html | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index d3fe3f15..15751c66 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -13,12 +13,12 @@ max(u.code_text) AS region_main_code_name, case a.account_disabled when false then '사용' when true then '미사용' end account_disabled_flag from admin a - join admin_has_role ahr ON a.seq = ahr.admin_seq + join admin_has_role ahr ON a.seq = ahr.admin_seq and ahr.is_deleted = false left join uicode u ON u.parent_id = 'code.region.main' AND u.id = a.region_main_code - left join researcher_has_household rhh ON rhh.admin_seq = a.seq - left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true + left join researcher_has_household rhh ON rhh.admin_seq = a.seq and rhh.is_deleted = false + left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true and h.is_deleted = false where - ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false + ahr.role_id = 'ROLE_RESEARCHER' and a.name LIKE CONCAT('%', #{searchValue}, '%') diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 10d0f25e..c920931a 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -93,6 +93,7 @@ +
@@ -144,6 +145,7 @@ +