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 a9a06577..2f1f0e60 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
@@ -10,9 +10,6 @@ import org.springframework.validation.Validator;
@Component
public class AdminUpdateValidator implements Validator {
- // 비밀번호: 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상
- private final String PASSWORD_REGEX = "^(?=.*[0-9])(?=.*[!@#$%_\\-]).{5}$";
-
@Override
public boolean supports(Class> clazz) {
return AdminUpdateBindingVO.class.equals(clazz);
@@ -66,11 +63,5 @@ public class AdminUpdateValidator implements Validator {
errors.rejectValue("regionMainCode", "valid.common.required","필수입력항목을 확인해주세요.");
}
});
-
- // [2] 비밀번호 형식 검사
- if (!vo.getUpdatePassword().matches(PASSWORD_REGEX)) {
- errors.rejectValue("updatePassword", "valid.common.password.wrong",
- "비밀번호는 5자, 숫자 + 특수문자(!@#$%_-) 1개 이상입니다.");
- }
}
}
diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml
index d76fd0ce..4aee8c9a 100644
--- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml
+++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml
@@ -24,18 +24,10 @@
region_sub_code,
region_detail_code,
address,
-
industry_large_code,
-
-
industry_middle_code,
-
-
industry_sub_middle,
-
-
industry_detail,
-
is_panel,
usage_type,
employment_type,
diff --git a/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml
index 5d16fa24..ca0668e3 100644
--- a/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml
+++ b/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml
@@ -18,18 +18,10 @@
region_sub_code = #{regionSubCode},
region_detail_code = #{regionDetailCode},
address = #{address},
-
industry_large_code = #{industryLargeCode},
-
-
industry_middle_code = #{industryMiddleCode},
-
-
industry_sub_middle = #{industrySubMiddle},
-
-
industry_detail = #{industryDetail},
-
is_panel = #{isPanel},
usage_type = #{usageType},
diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml
index c5745ffa..18185429 100644
--- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml
+++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml
@@ -342,9 +342,15 @@
) AS hvr
1=1
-
+
/* 경영주 검색 */
+
+ AND (
+ hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
+ OR hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%'
+ )
+
AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js
index 3d681c70..816ba08e 100644
--- a/admin/src/main/resources/static/ui/uiUtil.js
+++ b/admin/src/main/resources/static/ui/uiUtil.js
@@ -492,8 +492,9 @@ const setSelectBoxUiCode = ({
codeList,
parentSelector,
childSelector,
+ defaultOptionText = '전체',
selectedParentCode = '',
- selectedChildCode = ''
+ selectedChildCode = '',
}) => {
const $parent = $(parentSelector);
const $child = $(childSelector);
@@ -501,16 +502,20 @@ const setSelectBoxUiCode = ({
if (!codeList?.nodes || !$parent.length || !$child.length) return;
const renderOptions = ($el, list, selected) => {
- $el.html('');
+ $el.html(``);
list.forEach(item => {
const val = item.id.split('.').pop();
const isSelected = item.id === selected ? 'selected' : '';
$el.append(``);
});
+
+ if (selected) {
+ $el.val(selected);
+ }
};
const loadChildren = (parentId, selectedChild = '') => {
- $child.html('');
+ $child.html(``);
if (!parentId) return;
const parent = codeList.nodes.find(n => n.id === parentId);
diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html
index 39bccce9..fc9b66dd 100644
--- a/admin/src/main/resources/templates/common/components.html
+++ b/admin/src/main/resources/templates/common/components.html
@@ -168,7 +168,6 @@
홈
diff --git a/admin/src/main/resources/templates/common/modal-household-mapping.html b/admin/src/main/resources/templates/common/modal-household-mapping.html
index 073890fb..4c139999 100644
--- a/admin/src/main/resources/templates/common/modal-household-mapping.html
+++ b/admin/src/main/resources/templates/common/modal-household-mapping.html
@@ -10,7 +10,7 @@
-