diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java index 100af930..b3a169af 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java @@ -48,8 +48,8 @@ public class AdminCreateValidator implements Validator { 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.getName().length() > 10) { + errors.rejectValue("name", "error.name", "이름은 10자까지 입력가능합니다."); } if (vo.getPhone1() == null || vo.getPhone1().isBlank()) { errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요."); 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 c6224ddd..784e068f 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 @@ -34,8 +34,8 @@ public class AdminUpdateValidator implements Validator { 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.getName().length() > 10) { + errors.rejectValue("name", "error.name", "이름은 10자까지 입력가능합니다."); } if (vo.getPhone1() == null || vo.getPhone1().isBlank()) { errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요."); diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java index 4b9a68a9..384afe87 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/persistence/ResearcherDao.java @@ -115,4 +115,5 @@ public class ResearcherDao implements ResearcherPortOut { } return i; } + } diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java index b96e643f..c62fedb7 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/ResearcherApiController.java @@ -17,6 +17,7 @@ import java.util.Objects; @RequiredArgsConstructor @RequestMapping(path = "/api/researcher") class ResearcherApiController { + private final ResearcherPortIn researcherPortIn; @GetMapping(path = "/list") @@ -63,4 +64,5 @@ class ResearcherApiController { ResponseEntity updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) { return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.updateMappingHousehold(reqVO)); } + } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java index 3ac93585..33922633 100644 --- a/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/researcher/ports/ResearcherPortIn.java @@ -7,6 +7,7 @@ import org.springframework.data.domain.Page; import java.util.List; public interface ResearcherPortIn { + Page list(ResearchersListReqVO reqVO); ResearchersDto detail(Integer adminSeq); Page mappingHouseholdList(ResearchersDetailReqVO reqVO); @@ -17,4 +18,5 @@ public interface ResearcherPortIn { Integer visitHouseholdDelete(List selectIds); Page searchMappingHousehold(HouseholdSearchReqVO reqVO); Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO); + } \ No newline at end of file diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index 33e8a7d7..5162f6b6 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -64,9 +64,9 @@ app: permit: 5 session: validity: - # 세션 유효기간(초) - 1시간 (3600초) + # 세션 유효기간(초) - 무한정으로 수정,,, period: - seconds: 3600 + seconds: -1 maximum: # 최대 세션 갯수 (1일 경우 중복 로그인 불가) num: 1 diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index 38a44745..d3ee37ca 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -19,6 +19,9 @@ left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true and h.is_deleted = false where ahr.role_id = 'ROLE_RESEARCHER' + + and ( a.name LIKE CONCAT('%', #{searchValue}, '%') or a.phone LIKE CONCAT('%', #{searchValue}, '%') ) + and a.name LIKE CONCAT('%', #{searchValue}, '%') diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index c90a34b1..75357bdf 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -79,7 +79,7 @@
+ th:field="*{name}" maxlength="10"/>
에러 메세지 @@ -97,12 +97,12 @@
- +
- +
diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 9621a528..5514f9a3 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -165,7 +165,6 @@ f.searchDisabled.value = ''; } - function goUpdate(adminId) { 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 0ae44a50..b460a668 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -71,7 +71,7 @@
+ th:field="*{name}" maxlength="10" />
에러 메세지 @@ -89,7 +89,7 @@
-
@@ -99,7 +99,7 @@
-
diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 493ec830..a2614f5a 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -25,7 +25,7 @@
- +
@@ -181,6 +181,8 @@ f.searchValue.value = ''; f.searchArea.value = ''; f.searchAccountDisabled.value = ''; + f.method = 'GET'; + f.submit(); } // 상세페이지 이동 function goDetail(seq) {