[BO] 관리자만 엑셀다운로드/업로드, 지방실사 로그인시 해당 실사지역의 대시보드 현황 노출되어야 함함
This commit is contained in:
@@ -55,7 +55,7 @@ public class ChartDao implements ChartPortOut {
|
|||||||
return new ChartDto(
|
return new ChartDto(
|
||||||
recordMonthText,
|
recordMonthText,
|
||||||
chartMapper.selectTotalPercentage(reqVO,activeProfiles),
|
chartMapper.selectTotalPercentage(reqVO,activeProfiles),
|
||||||
null,
|
chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles),
|
||||||
chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles),
|
chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles),
|
||||||
null);
|
null);
|
||||||
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
|
} else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) {
|
||||||
|
|||||||
@@ -76,6 +76,9 @@
|
|||||||
<if test="'prod'.equals(activeProfiles)">
|
<if test="'prod'.equals(activeProfiles)">
|
||||||
and u.in_use = true
|
and u.in_use = true
|
||||||
</if>
|
</if>
|
||||||
|
<if test="reqVO.regionMainCode != null and reqVO.regionMainCode != ''">
|
||||||
|
and h.region_main_code = #{reqVO.regionMainCode}
|
||||||
|
</if>
|
||||||
GROUP BY ROLLUP(u.code_text)
|
GROUP BY ROLLUP(u.code_text)
|
||||||
ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 1 ELSE 0 END,
|
ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 1 ELSE 0 END,
|
||||||
MIN(u.order_no) NULLS LAST,
|
MIN(u.order_no) NULLS LAST,
|
||||||
|
|||||||
@@ -135,7 +135,7 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="component-btns bottom-btn-group">
|
<div class="component-btns bottom-btn-group" th:if="${loginUserRoles.id == 'ROLE_ADMIN'}">
|
||||||
<div class="btns-row align-right">
|
<div class="btns-row align-right">
|
||||||
<div class="btns-col-2">
|
<div class="btns-col-2">
|
||||||
<button type="button" class="btn" onclick="goExcel();">
|
<button type="button" class="btn" onclick="goExcel();">
|
||||||
|
|||||||
@@ -267,7 +267,8 @@
|
|||||||
|
|
||||||
<div class="component-btns bottom-btn-group">
|
<div class="component-btns bottom-btn-group">
|
||||||
<div class="btns-row align-right">
|
<div class="btns-row align-right">
|
||||||
<button type="button" class="btn" onclick="showExcelHouseholdModal();" >
|
<!-- 관리자만 노출 -->
|
||||||
|
<button type="button" class="btn" th:if="${userRole == 'ROLE_ADMIN'}" onclick="showExcelHouseholdModal();" >
|
||||||
<span class="btn-txt">엑셀 업로드</span>
|
<span class="btn-txt">엑셀 업로드</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn" onclick="showExcelDownloadModal();">
|
<button type="button" class="btn" onclick="showExcelDownloadModal();">
|
||||||
|
|||||||
Reference in New Issue
Block a user