Merge branch 'bo_fixes' into 'dev'
[BO] 임가현황 adminRole param 권한 비노출되도록 수정 See merge request korea-research/korea-research!120
This commit is contained in:
@@ -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() {
|
||||
|
||||
@@ -41,8 +41,8 @@ class GetHouseholdsStatusController {
|
||||
reqVO.getResearcherValue(),
|
||||
reqVO.getIsPanel(),
|
||||
AdminUtil.getLoginUserSeq(),
|
||||
reqVO.getUserRole(),
|
||||
reqVO.getUserRegionMainCode(),
|
||||
AdminUtil.getLoginUserRole(),
|
||||
AdminUtil.getLoginUserRegionMainCode(),
|
||||
Boolean.TRUE)));
|
||||
}
|
||||
}
|
||||
@@ -41,8 +41,4 @@ public class GetHouseholdsStatusReqVO {
|
||||
private String researcherValue;
|
||||
// 패널 유지 여부
|
||||
private Boolean isPanel;
|
||||
// 로그인한 유저 역할
|
||||
private String userRole;
|
||||
// 로그인한 유저 실사 지역
|
||||
private String userRegionMainCode;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user