From 67716172b2e86e38b70bed0d9973f829e237db28 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 14 Jul 2025 13:23:11 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=88=98=EC=A0=95=20:=20=EC=9E=84?= =?UTF-8?q?=EA=B0=80=20=EC=88=98=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/web/UpdateHouseholdController.java | 4 ++-- .../web/UpdateHouseholdStatusUIController.java | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java index 2e46555c..0849dc7e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java @@ -52,8 +52,8 @@ class UpdateHouseholdController { reqVO.getIndustryDetail(), reqVO.getResearcherSeq(), reqVO.getIsPanel(), - reqVO.getUsageType().name(), - reqVO.getEmploymentType().name(), + reqVO.getUsageType() != null ? reqVO.getUsageType().name() : null, + reqVO.getEmploymentType() != null ? reqVO.getEmploymentType().name() : null, reqVO.getMemo() ) ); diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index 667c3457..b053fb15 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -52,6 +52,11 @@ class UpdateHouseholdStatusUIController { GetHouseholdStatus result = getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null); + String tel = StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel() : ""; + String[] telParts = tel.split("-"); + String phone = StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone() : ""; + String[] phoneParts = phone.split("-"); + if (result != null) { model.addAttribute("householdInfo", new UpdateHouseholdStatusUIResVO( @@ -59,12 +64,12 @@ class UpdateHouseholdStatusUIController { result.getHouseholdNum(), result.getHouseholdName(), result.getHouseholdAge(), - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "", - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "", - StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "", - StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "", + telParts.length > 0 ? telParts[0] : "", + telParts.length > 1 ? telParts[1] : "", + telParts.length > 2 ? telParts[2] : "", + phoneParts.length > 0 ? phoneParts[0] : "", + phoneParts.length > 1 ? phoneParts[1] : "", + phoneParts.length > 2 ? phoneParts[2] : "", result.getRegionMainCode(), result.getRegionSubCode(), result.getRegionDetailCode(),