From c8123527d92c5b852c493a9142f6cc780def2de5 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 09:26:07 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8D=BC?= =?UTF-8?q?=EB=B8=94=20=EC=9E=85=ED=9E=88=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/admin/adminList.html | 68 ++++++++----------- .../templates/admin/adminUpdateForm.html | 6 +- .../adapters/persistence/GetAdminsDao.java | 3 + .../ports/application/domain/GetAdmins.java | 3 + .../mappers/admin/GetAdminsMapper.xml | 6 +- 5 files changed, 42 insertions(+), 44 deletions(-) diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 2e0ce42a..a3596297 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -72,74 +72,66 @@ -
-
- - -
+
+
+
+ +
-
-
-
Total:
-
-
+

+ 총 건 +

- - - - - - - + + + + + - - + + - - - + + +
# ID권한활성화 - 등록일 - 수정일 + 아이디이름권한실사계정사용여부생성일
+ 아이디 - 아이디이름 - + 등록일수정일실사생성일
+
- - - + + +
diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index 72aa2840..648c9f15 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -3,12 +3,11 @@ xmlns:th="http://www.thymeleaf.org">
-
- +
@@ -152,7 +151,7 @@
-
+
@@ -161,6 +160,7 @@
+
diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java index 11d9f74a..18cf9c63 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java @@ -42,6 +42,9 @@ class GetAdminsDao implements GetAdminsPortOut { admins.stream() .map(admin -> new GetAdmins( admin.getId(), + admin.getName(), + admin.getPhone(), + admin.getRegionMainCodeName(), admin.getCreatedBy(), admin.getCreatedAt(), admin.getUpdatedBy(), diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdmins.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdmins.java index ead13987..3631c920 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdmins.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdmins.java @@ -12,6 +12,9 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class GetAdmins implements AuditOutput { private String id; + private String name; + private String phone; + private String regionMainCodeName; private String createdBy; private LocalDateTime createdAt; private String updatedBy; diff --git a/core/src/main/resources/mappers/admin/GetAdminsMapper.xml b/core/src/main/resources/mappers/admin/GetAdminsMapper.xml index 915e1ebf..9e99331a 100644 --- a/core/src/main/resources/mappers/admin/GetAdminsMapper.xml +++ b/core/src/main/resources/mappers/admin/GetAdminsMapper.xml @@ -7,10 +7,10 @@ SELECT a.seq, a.id AS id, - a.name, + COALESCE(a.name,'-') as name, a.region_main_code, - u.code_text as region_main_code_name, - a.phone, + COALESCE(u.code_text,'-') as region_main_code_name, + COALESCE(a.phone,'-') as phone, a.created_by, a.created_at, a.updated_by,