diff --git a/backend-spring/src/main/java/com/erp/controller/AdminController.java b/backend-spring/src/main/java/com/erp/controller/AdminController.java index 978ad236..a1c8d745 100644 --- a/backend-spring/src/main/java/com/erp/controller/AdminController.java +++ b/backend-spring/src/main/java/com/erp/controller/AdminController.java @@ -295,7 +295,8 @@ public class AdminController { @PostMapping("/users/reset-password") public ResponseEntity> resetUserPassword(@RequestBody Map body) { String userId = (String) body.get("user_id"); - adminService.resetUserPassword(userId); + String newPassword = (String) body.get("new_password"); + adminService.resetUserPassword(userId, newPassword); return ResponseEntity.ok(ApiResponse.success(null, "비밀번호 초기화 성공")); } diff --git a/backend-spring/src/main/java/com/erp/service/AdminService.java b/backend-spring/src/main/java/com/erp/service/AdminService.java index a83fc7a6..749ed51e 100644 --- a/backend-spring/src/main/java/com/erp/service/AdminService.java +++ b/backend-spring/src/main/java/com/erp/service/AdminService.java @@ -208,10 +208,17 @@ public class AdminService extends BaseService { } public void resetUserPassword(String userId) { - String defaultPw = passwordEncoder.encode("Welcome1!"); + resetUserPassword(userId, null); + } + + public void resetUserPassword(String userId, String newPassword) { + if (userId == null || userId.isBlank()) { + throw new IllegalArgumentException("user_id 는 필수입니다"); + } + String rawPw = (newPassword != null && !newPassword.isBlank()) ? newPassword : "Welcome1!"; Map params = new HashMap<>(); params.put("user_id", userId); - params.put("user_password", defaultPw); + params.put("user_password", passwordEncoder.encode(rawPw)); sqlSession.update("admin.updateUserPassword", params); } diff --git a/frontend/lib/api/user.ts b/frontend/lib/api/user.ts index db327caa..6704c2d7 100644 --- a/frontend/lib/api/user.ts +++ b/frontend/lib/api/user.ts @@ -199,7 +199,10 @@ export async function getUserHistory(userId: string, params?: Record