Merge branch 'dev_screen_data_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/GovernRankDataExtractServiceImpl.java

@@ -56,7 +56,7 @@ public class GovernRankDataExtractServiceImpl implements GovernRankDataExtractSe
 		//满意率 满意和非常满意占比
 		List<OrgStatisticsResultDTO> satisfactionList =  factOriginProjectLogDailyService.getGridSatisfaction(customerId, monthId);
 		if (!CollectionUtils.isEmpty(satisfactionList)) {
-			list.forEach(entity -> satisfactionList.stream().filter(item -> item.getAgencyId().equals(entity.getOrgId())).forEach(dto -> {
+			list.forEach(entity -> satisfactionList.stream().filter(item -> item.getOrgId().equals(entity.getOrgId())).forEach(dto -> {
 				if (dto.getSum() != NumConstant.ZERO) {
 					BigDecimal sum = new BigDecimal(dto.getSum());
 					BigDecimal count = new BigDecimal(dto.getCount());