diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java index c76e1ca3..32fa891a 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/ChartDao.java @@ -55,9 +55,9 @@ public class ChartDao implements ChartPortOut { return new ChartDto( recordMonthText, chartMapper.selectTotalPercentage(reqVO,activeProfiles), - null, + chartMapper.selectLocalRegionPercentage(reqVO,activeProfiles), chartMapper.selectLocalRegionResearcherPercentage(reqVO,activeProfiles), - null); + null); } else if("ROLE_LOCAL_INSPECTOR".equals(AdminUtil.getLoginUserRole())) { // 조사원 일경우 reqVO.setAdminSeq(AdminUtil.getLoginUserSeq()); diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index d7bb8ac9..b74013a3 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -76,6 +76,9 @@ and u.in_use = true + + and h.region_main_code = #{reqVO.regionMainCode} + GROUP BY ROLLUP(u.code_text) ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 1 ELSE 0 END, MIN(u.order_no) NULLS LAST, diff --git a/admin/src/main/resources/templates/home.html b/admin/src/main/resources/templates/home.html index 488d1b2e..391a8cb2 100644 --- a/admin/src/main/resources/templates/home.html +++ b/admin/src/main/resources/templates/home.html @@ -135,7 +135,7 @@ -
+