From 1322c8bb01cfe030b3dfaf7533e287e531f64d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 16 Jun 2025 08:51:22 +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=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/admin/adminCreateForm.html | 2 +- admin/src/main/resources/templates/admin/adminList.html | 7 +------ .../main/resources/templates/admin/adminUpdateForm.html | 4 ++-- .../saveAdmin/ports/application/SaveAdminService.java | 1 + .../saveAdmin/ports/application/domain/SaveAdminCmd.java | 4 ++-- core/src/main/resources/mappers/admin/SaveAdminMapper.xml | 6 ------ 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index ffa3d9dd..4157dc27 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -23,7 +23,7 @@ th:field="*{roleIds}" onchange="onRoleChange(this);"> - diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 62e5bea1..051725b3 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -79,13 +79,10 @@ ID 권한 - Email 활성화 - 계정잠김 등록일 수정일 @@ -104,11 +101,9 @@ + th:text="${role.getDescription()} + ${!status.last ? ', ': ''}"> - 이메일 - 등록일 수정일 diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index 0ebaef04..b017e14e 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -25,7 +25,7 @@ th:field="*{roleIds}" onchange="onRoleChange(this);"> - @@ -117,7 +117,7 @@ -
+
diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java index e85b296d..128fcd37 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java @@ -58,6 +58,7 @@ public class SaveAdminService implements SaveAdminPortIn { passwordUpdatedAt, regionMainCode, accountDisabled, + loginFailCnt, roleIds )); } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java index 74c0dce1..bb91497b 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java @@ -18,7 +18,7 @@ public class SaveAdminCmd extends AuditCommand { /* private String email;*/ private String regionMainCode; private Boolean accountDisabled; -/* private Integer loginFailCnt; - private Boolean accountLocked;*/ + private Integer loginFailCnt; +/* private Boolean accountLocked;*/ private List roleIds; } diff --git a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml index 1460ecfd..0bfbf1b7 100644 --- a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml +++ b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml @@ -12,22 +12,18 @@ INSERT INTO admin (seq, id, password, - email, region_main_code, password_updated_at, account_disabled, login_fail_cnt, - account_locked, ) VALUES (#{seq}, #{id}, #{encodedPassword}, - #{email}, #{regionMainCode}, #{passwordUpdatedAt}, #{accountDisabled}, #{loginFailCnt}, - #{accountLocked}, ) @@ -36,12 +32,10 @@ UPDATE admin SET password = #{encodedPassword}, - email = #{email}, region_main_code = #{regionMainCode}, password_updated_at = #{passwordUpdatedAt}, account_disabled = #{accountDisabled}, login_fail_cnt = #{loginFailCnt}, - account_locked = #{accountLocked}, WHERE seq = #{seq}