Merge branch 'bo_fixes' into 'dev'

[BO] 임가현황 adminRole param 권한 비노출되도록 수정

See merge request korea-research/korea-research!120
This commit is contained in:
이강선 매니저/ST
2025-07-17 06:49:13 +00:00
4 changed files with 6 additions and 11 deletions

View File

@@ -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() {

View File

@@ -41,8 +41,8 @@ class GetHouseholdsStatusController {
reqVO.getResearcherValue(),
reqVO.getIsPanel(),
AdminUtil.getLoginUserSeq(),
reqVO.getUserRole(),
reqVO.getUserRegionMainCode(),
AdminUtil.getLoginUserRole(),
AdminUtil.getLoginUserRegionMainCode(),
Boolean.TRUE)));
}
}

View File

@@ -41,8 +41,4 @@ public class GetHouseholdsStatusReqVO {
private String researcherValue;
// 패널 유지 여부
private Boolean isPanel;
// 로그인한 유저 역할
private String userRole;
// 로그인한 유저 실사 지역
private String userRegionMainCode;
}

View File

@@ -9,9 +9,6 @@
<input name="page" th:field="*{page}" type="hidden"/>
<input name="size" th:field="*{size}" type="hidden"/>
<input name="userRole" th:value="${userRole}" type="hidden"/>
<input name="userRegionMainCode" th:value="${userRegionMainCode}" type="hidden"/>
<div class="content-inner">
<!-- 필터 영역 -->
<section class="filter-wrap">
@@ -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