diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index 53919ce99a..06cc31bf13 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java @@ -274,9 +274,9 @@ public class ProjectServiceImpl implements ProjectService { List gridList = gridListResult.getData(); for (int i = 0; i < gridList.size(); i++) { ProjectNextAgencyResultDTO subAgencyDto = new ProjectNextAgencyResultDTO(); - subAgencyDto.setOrgId(agencyId); - subAgencyDto.setOrgName(customerAgencyDTO.getData().getOrganizationName()); - subAgencyDto.setOrgType(customerAgencyDTO.getData().getLevel()); + subAgencyDto.setOrgId(gridList.get(i).getGridId()); + subAgencyDto.setOrgName(gridList.get(i).getGridName()); + subAgencyDto.setOrgType("grid"); resultList.add(subAgencyDto); } } else {