Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp

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<GridByStaffResultDTO> 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 {