From 73db9585b5c1356a8abeaa6a4969f90650c89d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 20 Jun 2025 08:27:31 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EA=B2=80=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/web/AdminExcelController.java | 4 +++- .../adapters/web/AdminListController.java | 4 +++- .../adapters/web/model/AdminListFilterVO.java | 2 ++ .../resources/templates/admin/adminList.html | 8 ++++---- .../adapters/persistence/GetAdminsDao.java | 16 ++++++++++------ .../persistence/model/GetAdminsDto.java | 3 +++ .../ports/application/domain/GetAdminsCmd.java | 2 ++ .../resources/mappers/admin/GetAdminsMapper.xml | 17 +++++++++++++++-- 8 files changed, 42 insertions(+), 14 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminExcelController.java b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminExcelController.java index 8cdacf57..c579bee5 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminExcelController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminExcelController.java @@ -45,7 +45,9 @@ class AdminExcelController { new GetAdminsCmd( adminListFilterVO.getSearchField(), adminListFilterVO.getSearchValue(), - adminListFilterVO.getSearchRole())); + adminListFilterVO.getSearchRole(), + adminListFilterVO.getSearchArea(), + adminListFilterVO.getSearchDisabled())); if (CollectionUtils.isNotEmpty(listOutput.getContent())) { // Header diff --git a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminListController.java b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminListController.java index a94efe2b..edafaca7 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminListController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/AdminListController.java @@ -37,7 +37,9 @@ class AdminListController { new GetAdminsCmd( adminListFilterVO.getSearchField(), adminListFilterVO.getSearchValue(), - adminListFilterVO.getSearchRole())); + adminListFilterVO.getSearchRole(), + adminListFilterVO.getSearchArea(), + adminListFilterVO.getSearchDisabled())); model.addAttribute("listOutput", listOutput); model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); diff --git a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/model/AdminListFilterVO.java b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/model/AdminListFilterVO.java index 49cff1d5..bcf6bc95 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/model/AdminListFilterVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/getAdmins/adapters/web/model/AdminListFilterVO.java @@ -12,4 +12,6 @@ public class AdminListFilterVO { private String searchField; private String searchValue; private String searchRole; + private String searchArea; + private String searchDisabled; } diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index da575633..f6fa5f26 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -53,7 +53,7 @@

실사

- @@ -65,7 +65,7 @@

계정사용여부

- @@ -147,11 +147,11 @@
- -->