From 93d8219b3c40e5b831aa8d2c7f103249da1c9fba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 25 Jun 2025 15:54:34 +0900 Subject: [PATCH 1/5] =?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 --- .../application/aop/RoleUpdateAspect.java | 2 +- .../security/AdminDetailsService.java | 4 +- .../web/AdminCreatePostController.java | 6 +- .../web/AdminUpdateGetController.java | 9 +- .../web/AdminUpdatePostController.java | 44 +++---- .../web/model/AdminUpdateBindingVO.java | 21 +--- .../web/validator/AdminUpdateValidator.java | 41 ++++-- .../home/adapters/web/HomeController.java | 2 +- .../templates/admin/adminCreateForm.html | 11 +- .../resources/templates/admin/adminList.html | 20 ++- .../templates/admin/adminUpdateForm.html | 117 +++++++++++------- .../adapters/persistence/AdminViewDao.java | 2 +- .../adapters/persistence/AdminViewMapper.java | 2 +- .../ports/application/domain/AdminView.java | 2 +- 14 files changed, 154 insertions(+), 129 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java index 9f6503da..c4cf8d63 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java @@ -58,7 +58,7 @@ public class RoleUpdateAspect { if (beforeAdmin.isPresent()) { List beforeRoles = - beforeAdmin.get().getRoles().stream().map(CoreRole::getId).toList(); + beforeAdmin.stream().map(r -> r.getRole().getId()).toList(); if (beforeRoles.size() != currentRoles.size() || currentRoles.stream().anyMatch(item -> !beforeRoles.contains(item))) { createLog = true; diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index 6b756315..cc375c65 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -44,14 +44,14 @@ public class AdminDetailsService implements UserDetailsService { adminUser.getSeq(), adminUser.getId(), adminUser.getPassword(), - adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null), + adminUser.getRole().getId(), adminUser.getRegionMainCode(), adminUser.getLastLoginIp(), !accountDisabled, true, isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()), !accountLocked, - getAuthorities(adminUser.getRoles()), + getAuthorities(Stream.of(adminUser.getRole()).toList()), passwordValidPeriodDays - getDaysPassedFrom(adminUser.getPasswordUpdatedAt())); } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java index 9482d9d8..b3e3e5ca 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java @@ -41,9 +41,9 @@ public class AdminCreatePostController { savePortIn.apiConnect(bindingVO.getSeq(), bindingVO.getId(), bindingVO.getPassword(), - bindingVO.getName(), - "010-"+bindingVO.getPhone1()+"-"+bindingVO.getPhone2(), - bindingVO.getRegionMainCode(), + "ROLE_RESEARCHER".equals(bindingVO.getRoleId())?bindingVO.getName():null, + "ROLE_RESEARCHER".equals(bindingVO.getRoleId())?"010-"+bindingVO.getPhone1()+"-"+bindingVO.getPhone2():null, + !"ROLE_ADMIN".equals(bindingVO.getRoleId())?bindingVO.getRegionMainCode():null, bindingVO.getAccountDisabled(), bindingVO.getRoleId())); } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java index e8ab7a40..02362a55 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java @@ -46,19 +46,16 @@ class AdminUpdateGetController { AdminUpdateBindingVO bindingVO = new AdminUpdateBindingVO( - output.getCreatedBy(), - output.getCreatedAt(), - output.getUpdatedBy(), - output.getUpdatedAt(), output.getSeq(), output.getId(), null, output.getName(), - output.getPhone(), + output.getPhone().split("-")[1], + output.getPhone().split("-")[2], output.getRegionMainCode(), output.getPasswordUpdatedAt(), output.getAccountDisabled(), - output.getRoles().stream().map(CoreRole::getId).collect(Collectors.toList())); + output.getRole().getId()); model.addAttribute("bindingVO", bindingVO); model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java index 07bb43d9..b2d154af 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java @@ -9,16 +9,20 @@ import app.module.core.usecase.role.list.ports.RoleListPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import java.util.stream.Collectors; -@Controller +@RestController @RequiredArgsConstructor class AdminUpdatePostController { @@ -28,34 +32,24 @@ class AdminUpdatePostController { private final SaveAdminPortIn saveAdminPortIn; private final MessageUtil messageUtil; - @PostMapping(path = "/settings/admins/update/{id}") - String operate( - Model model, - RedirectAttributes redirectAttributes, - @Valid @ModelAttribute("bindingVO") AdminUpdateBindingVO bindingVO, - BindingResult bindingResult) { + @PostMapping(path = "/api/settings/admin/update") + ResponseEntity operate( @RequestBody AdminUpdateBindingVO bindingVO, BindingResult bindingResult) { adminUpdateValidator.validate(bindingVO, bindingResult); if (bindingResult.hasErrors()) { - model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); - model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main")); - return "admin/adminUpdateForm"; + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY.value()) + .body(bindingResult.getAllErrors().get(0).getDefaultMessage()); } - saveAdminPortIn.apiConnect( - bindingVO.getSeq(), - bindingVO.getId(), - bindingVO.getUpdatePassword(), - bindingVO.getName(), - bindingVO.getPhone(), - bindingVO.getRegionMainCode(), - bindingVO.getAccountDisabled(), - bindingVO.getRoleIds().stream().collect(Collectors.joining())); - - redirectAttributes.addFlashAttribute( - "operationMessage", - messageUtil.getMessage("operation.settings.admin.updated", bindingVO.getId())); - - return "redirect:/settings/admins"; + return ResponseEntity.status(HttpStatus.OK).body( + saveAdminPortIn.apiConnect( + bindingVO.getSeq(), + bindingVO.getId(), + bindingVO.getUpdatePassword(), + "ROLE_RESEARCHER".equals(bindingVO.getRoleId())?bindingVO.getName():null, + "ROLE_RESEARCHER".equals(bindingVO.getRoleId())?"010-"+bindingVO.getPhone1()+"-"+bindingVO.getPhone2():null, + !"ROLE_ADMIN".equals(bindingVO.getRoleId())? bindingVO.getRegionMainCode():null, + bindingVO.getAccountDisabled(), + bindingVO.getRoleId())); } } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java index b94bf5f2..0f112fc6 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java @@ -1,26 +1,16 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web.model; -import app.module.core.config.application.component.AuditOutput; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; import java.time.LocalDateTime; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class AdminUpdateBindingVO implements AuditOutput { - - private final String createdBy; - - private final LocalDateTime createdAt; - - private final String updatedBy; - - private final LocalDateTime updatedAt; +@NoArgsConstructor +public class AdminUpdateBindingVO{ private Long seq; private String id; @@ -33,12 +23,13 @@ public class AdminUpdateBindingVO implements AuditOutput { message = "{valid.common.email.wrong}") private String email;*/ private String name; - private String phone; + private String phone1; + private String phone2; private String regionMainCode; private LocalDateTime passwordUpdatedAt; private Boolean accountDisabled; /* private Integer loginFailCnt; private Boolean accountLocked;*/ - private List roleIds; + private String roleId; } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java index d6ebabdd..c6224ddd 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java @@ -4,12 +4,14 @@ import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBi import java.util.Optional; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; +import org.springframework.validation.ValidationUtils; import org.springframework.validation.Validator; @Component public class AdminUpdateValidator implements Validator { - private final String PASSWORD_REGEX = "^((?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%_\\-])\\S{6,15})$"; + // 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상 + private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$"; @Override public boolean supports(Class clazz) { @@ -20,23 +22,38 @@ public class AdminUpdateValidator implements Validator { public void validate(Object target, Errors errors) { AdminUpdateBindingVO vo = (AdminUpdateBindingVO) target; - Optional.ofNullable(vo.getRoleIds()) - .filter(ids -> ids.size() < 1) - .ifPresent( - ids -> - errors.rejectValue( - "roleIds", "valid.common.required.size.min", new Object[]{1}, "")); + if (vo.getRoleId() == null || vo.getRoleId().isEmpty()) { + errors.rejectValue("roleId", "error.roleId", "권한을 선택해주세요."); + } Optional.ofNullable(vo.getUpdatePassword()) - .filter(s -> !s.trim().isEmpty() && !s.matches(PASSWORD_REGEX)) - .ifPresent(s -> errors.rejectValue("updatePassword", "valid.common.password.wrong")); + .filter(password -> !password.trim().isEmpty() && !password.matches(PASSWORD_REGEX)) + .ifPresent(password -> errors.rejectValue("updatePassword", "valid.common.password.wrong","비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다.")); + if (vo.getRoleId() != null && "ROLE_RESEARCHER".equals(vo.getRoleId())) { + if (vo.getName() == null || vo.getName().isBlank()) { + errors.rejectValue("name", "error.name", "이름을 입력해주세요."); + } + if (vo.getName().length() > 4) { + errors.rejectValue("name", "error.name", "이름은 4자리까지 입력가능합니다."); + } + if (vo.getPhone1() == null || vo.getPhone1().isBlank()) { + errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요."); + } else if (!vo.getPhone1().matches("^\\d{4}$")) { + errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리는 4자리 숫자여야 합니다."); + } + if (vo.getPhone2() == null || vo.getPhone2().isBlank()) { + errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리를 입력해주세요."); + } else if (!vo.getPhone2().matches("^\\d{4}$")) { + errors.rejectValue("phone2", "error.phone2", "전화번호 뒷자리는 4자리 숫자여야 합니다."); + } + } // ROLE_ADMIN이 아닌 경우 regionMainCode null체크 - Optional.ofNullable(vo.getRoleIds()) - .filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN"))) + Optional.ofNullable(vo.getRoleId()) + .filter(id -> !id.equals("ROLE_ADMIN")) .ifPresent(nonAdmins -> { if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) { - errors.rejectValue("regionMainCode", "valid.common.required"); + errors.rejectValue("regionMainCode", "valid.common.required","실사지역을 선택해주세요."); } }); } diff --git a/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java b/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java index 41bb2360..390ca5bc 100644 --- a/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/home/adapters/web/HomeController.java @@ -22,7 +22,7 @@ public class HomeController { .ifPresent( loginUser -> { model.addAttribute("loginUser", loginUser); - model.addAttribute("loginUserRoles", loginUser.getRoles()); + model.addAttribute("loginUserRoles", loginUser.getRole()); }); return "home"; diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index 6e941a00..c90a34b1 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -235,19 +235,18 @@ ajaxUtil._ajaxMethod( '/api/settings/admin/create', JSON.stringify(dataOj), - function(response) { // 성공 - alert("등록이 완료되었습니다."); - location.href = '/settings/admins'; + function(response) { }, function (code, rstData) { - if(code == 422) alert(rstData.responseText); - if(code == 200 ){ + if(code === 422) alert(rstData.responseText); + if(code === 200 ){ alert("등록이 완료되었습니다."); location.href = '/settings/admins'; } }, 'post', - 'json' + 'json', + { handle422Type: 'alert' } ); } diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index a3596297..9621a528 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -96,13 +96,12 @@ - 아이디 - 이름 - 권한 - 실사 - 계정사용여부 - 생성일 - + 아이디 + 이름 + 권한 + 실사 + 계정사용여부 + 생성일 @@ -166,12 +165,9 @@ f.searchDisabled.value = ''; } - // 수정페이지 이동 + function goUpdate(adminId) { - const f = document.adminParamForm; - f.action = '/settings/admins/update/' + adminId; - f.method = 'get'; - f.submit(); + location.href = '/settings/admins/update/' + adminId; // 쿼리 파라미터 없이 이동 } // 체크박스 선택/해제 diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index 648c9f15..0ae44a50 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -6,28 +6,34 @@
+ th:object="${bindingVO}" + name="adminUpdateForm" + onsubmit="event.preventDefault(); updateAdmin(); return false;">
- + @@ -40,24 +46,25 @@ - + + th:classappend="${#lists.isEmpty(bindingVO.roleId) or #lists.contains(bindingVO.roleId, 'ROLE_LOCAL_INSPECTOR')} ? 'd-none'"> + th:classappend="${#lists.isEmpty(bindingVO.roleId) or #lists.contains(bindingVO.roleId, 'ROLE_ADMIN')} ? 'd-none'">
-
- -
-
- 에러 메세지 +
+
+
+ +
+
+ 에러 메세지 +
+
- +
+ 에러 메세지 +
-
- 에러 메세지 -
+ 총 5자 / 숫자 + 특수문자 1개 이상 (!,@,#,$,%,_,-)
@@ -83,25 +90,28 @@
+ th:value="${bindingVO.phone1 != null ? bindingVO.phone1 : ''}">
+
+ 에러 메세지 +
+ th:value="${bindingVO.phone2 != null ? bindingVO.phone2 : ''}">
+
+ 에러 메세지 +
-
- 에러 메세지 -
-
@@ -128,16 +138,16 @@
+
@@ -155,12 +166,13 @@ -
+
@@ -185,18 +197,14 @@ } $(document).ready(() => { - showAudit([[${bindingVO.id}]], [[${bindingVO.createdBy}]], - [[${#temporals.format(bindingVO.createdAt, "yyyy-MM-dd'T'HH:mm:ss")}]], - [[${bindingVO.updatedBy}]], - [[${#temporals.format(bindingVO.updatedAt, "yyyy-MM-dd'T'HH:mm:ss")}]]); - // 초기 로드 시 roleIds에 따라 regionMainCodeArea 표시/숨김 - const roleSelect = document.getElementById('roleIds'); + // 초기 로드 시 roleId에 따라 regionMainCodeArea 표시/숨김 + const roleSelect = document.getElementById('roleId'); if (roleSelect) { onRoleChange(roleSelect); } - $('form').on('submit', function() { +/* $('form').on('submit', function() { const phone1 = $('#phone1').val(); const phone2 = $('#phone2').val(); if (phone1 && phone2) { @@ -204,7 +212,7 @@ } else { $('#phone').val(''); } - }); + });*/ }); @@ -215,6 +223,29 @@ $('.researcherArea').toggle(idResearcher); }; + const updateAdmin = () => { + + const f = document.adminUpdateForm; + let dataOj = $(f).serializeObject(); + + ajaxUtil._ajaxMethod( + '/api/settings/admin/update', + JSON.stringify(dataOj), + function(response) { + }, + function (code, rstData) { + if(code === 422) alert(rstData.responseText); + if(code === 200 ){ + alert("수정이 완료되었습니다."); + location.href = '/settings/admins'; + } + }, + 'post', + 'json', + { handle422Type: 'alert' } + ); + } + diff --git a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java index d51e07ba..ff1cf6d5 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java @@ -17,7 +17,7 @@ class AdminViewDao implements AdminViewPortOut { @Transactional public Optional connect(String id) { return mapper.findById(id).map(admin -> { - admin.setRoles(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq())); + admin.setRole(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq())); return admin; }); } diff --git a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java index a82005ad..fd74a545 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java @@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface AdminViewMapper { Optional findById(String id); - List findRoleHasPrivilegesByAdminId(Long id); + CoreRole findRoleHasPrivilegesByAdminId(Long id); } diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java index 1108a23c..2d63888f 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java @@ -29,5 +29,5 @@ public class AdminView implements Serializable { private String createdBy; private LocalDateTime updatedAt; private String updatedBy; - private List roles; + private CoreRole role; } From 656f7a3568db90313be9a355714f50c25c132161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 25 Jun 2025 16:01:02 +0900 Subject: [PATCH 2/5] =?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 --- .../saveAdmin/adapters/web/AdminUpdateGetController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java index 02362a55..cceeaced 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java @@ -50,8 +50,8 @@ class AdminUpdateGetController { output.getId(), null, output.getName(), - output.getPhone().split("-")[1], - output.getPhone().split("-")[2], + output.getPhone() != null?output.getPhone().split("-")[1] : "", + output.getPhone() != null?output.getPhone().split("-")[2] : "", output.getRegionMainCode(), output.getPasswordUpdatedAt(), output.getAccountDisabled(), From 0557762f9245e19ae38205b094f0c9edc6f54aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Wed, 25 Jun 2025 16:04:25 +0900 Subject: [PATCH 3/5] =?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 --- .../saveAdmin/adapters/web/AdminUpdateGetController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java index cceeaced..a85cf7fe 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java @@ -50,8 +50,8 @@ class AdminUpdateGetController { output.getId(), null, output.getName(), - output.getPhone() != null?output.getPhone().split("-")[1] : "", - output.getPhone() != null?output.getPhone().split("-")[2] : "", + output.getPhone() != null&& output.getPhone().matches("\\d{3}-\\d{4}-\\d{4}")?output.getPhone().split("-")[1] : "", + output.getPhone() != null&& output.getPhone().matches("\\d{3}-\\d{4}-\\d{4}")?output.getPhone().split("-")[2] : "", output.getRegionMainCode(), output.getPasswordUpdatedAt(), output.getAccountDisabled(), From 40db7ba002a81245d9644e5b45c92813ae4f11be Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Wed, 25 Jun 2025 16:05:27 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[FO]=20=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=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/info/user/user.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index f4a151cb..f8ed1474 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -85,14 +85,14 @@
- +
- +
@@ -113,14 +113,14 @@
- +
- +
From 063c9018e421f4ae8726f527b6568318f6533436 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 26 Jun 2025 11:19:36 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9?= =?UTF-8?q?=20-=20=EA=B2=80=EC=83=89=20=EC=88=98=EC=A0=95,=20=EC=A1=B0?= =?UTF-8?q?=EC=82=AC=EC=9B=90=ED=98=84=ED=99=A9=20-=20=EC=9E=84=EA=B0=80?= =?UTF-8?q?=EC=83=81=EC=84=B8=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../household/GetHouseholdsStatusMapper.xml | 16 ++++++++++++++-- .../resources/templates/researcher/detail.html | 7 ++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index 7c7dff51..270c1f79 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -83,9 +83,15 @@ 1=1 - + /* 경영주 검색 */ + + AND ( + hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%' + OR hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%' + ) + AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%' @@ -95,9 +101,15 @@ - + /* 조사원 검색 */ + + AND ( + hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%' + OR hvr.researcherPhone ILIKE '%' || #{cmd.researcherValue} || '%' + ) + AND hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%' diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index c920931a..6c7a201f 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -42,6 +42,8 @@
+ +
@@ -218,8 +220,8 @@ tbody.append( ` - ${ct.householdNum} - ${ct.ownerName || '-'} + ${ct.householdNum} + ${ct.ownerName || '-'} ${ct.phone || '-'} ${ct.regionMainCodeName || '-'} ${ct.regionSubCodeName || '-'} @@ -231,7 +233,6 @@ ` ); }); - // TODO 임가번호 OR 경영주명 선택시 임가현황 상세화면으로 이동 if (!$(response.content).length) { tbody.append(`