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 @@
실사