diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index 27207001..5a477137 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -51,7 +51,7 @@ public class AdminUtil { } AdminUser user = (AdminUser) authentication.getPrincipal(); - return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode(); + return user.getRegionMainCode() == null ? null : user.getRegionMainCode(); } public static String getLoginUserLastIp() { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index f3171dcd..9a0ce4c9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -41,8 +41,8 @@ class GetHouseholdsStatusController { reqVO.getResearcherValue(), reqVO.getIsPanel(), AdminUtil.getLoginUserSeq(), - reqVO.getUserRole(), - reqVO.getUserRegionMainCode(), + AdminUtil.getLoginUserRole(), + AdminUtil.getLoginUserRegionMainCode(), Boolean.TRUE))); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java index 93d29d73..213907a1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java @@ -41,8 +41,4 @@ public class GetHouseholdsStatusReqVO { private String researcherValue; // 패널 유지 여부 private Boolean isPanel; - // 로그인한 유저 역할 - private String userRole; - // 로그인한 유저 실사 지역 - private String userRegionMainCode; } diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index df290145..e5a14fbb 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -9,9 +9,6 @@ - - -
@@ -305,6 +302,8 @@ const selectedIndustryLargeCode = /*[[${reqVO.industryLargeCode}]]*/ ''; const selectedIndustryMiddleCode= /*[[${reqVO.industryMiddleCode}]]*/ ''; + const userRole = /*[[${userRole}]]*/ ''; + $(document).ready(function () { // 지역, 세부지역 셀렉트박스 세팅 setSelectBoxUiCode({ @@ -382,7 +381,7 @@ // 현재 로그인한 유저의 역할 - const isResearcher = f.userRole.value === 'ROLE_RESEARCHER'; + const isResearcher = userRole === 'ROLE_RESEARCHER'; const colspanLength = isResearcher ? 13 : 15; // 조사원일 경우 조사원이름, 번호 칼럼 hide