diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
index 7e73848bdb..413fc6cd19 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
@@ -58,11 +58,11 @@ public class GovIssueServiceImpl implements GovIssueService {
     @Override
     public AllIssueResultDTO allIssueList(AllIssueFormDTO formDTO, TokenDto tokenDto) {
         if (CollectionUtils.isEmpty(formDTO.getGridIdList())){
-            String userId = govOrgService.getAgencyIdByUserId(tokenDto.getUserId());
-            if (StringUtils.isBlank(userId)){
+            String agencyId = govOrgService.getAgencyIdByUserId(tokenDto.getUserId());
+            if (StringUtils.isBlank(agencyId)){
                 throw new RenException(IssueConstant.GET_AGENCY_FAILURE);
             }
-            List<GridInfoResultDTO> gridList = govOrgService.gridList(userId);
+            List<GridInfoResultDTO> gridList = govOrgService.gridList(agencyId);
             if (CollectionUtils.isEmpty(gridList)){
                 throw new RenException(IssueConstant.GET_GRID_LIST_FAILURE);
             }